More cleanup
Update testnet so that it is reinexed correctly
Update bitcoin config files
Update testnet-in-box
Update testnet again...
Delete unused bitcoin.conf file
Remove -reindex, non purging of the bitcoin config folders was the cause
Don't allow others to connect to our client
Merge branch 'master' into fixed_btc