Master 1.6 test branch

Test branch - uses the 1.5 optimisations, but from block 0. Block time set to 5s, for use on the testnet.