Revert upstream change
Update checkpoint
Do a better job of tracking peers' head blocks -- when we send them a block through the normal inventory mechanism, update our records
Merge branch 'develop' into btsx
Merge pull request #75 from vikramrajkumar/btsx

Merge fixes