Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin