Refactored a lot of the chain catchup/reorg.
Merge branch 'develop' of github.com:ethereum/eth-go into develop