BC - commiting even more stuff
BC Syncing
resync
Merge pull request #5 from TimPaisley/master

TP syncing again
TP Sunday final commit