Merge pull request #1 from gavinandresen/master

Tweaked bitcoind patch
Move test scripts to contrib
Latest comp tool (upstream/master of bitcoinj =D)
Fix for 32-bit jvm in pull-tester