Various fixes
Merge branch 'develop' of https://github.com/kargakis/bitcoinbook into kargakis-develop
The comma around 'any orphans found' is not needed AFAIK
Merge branch 'kargakis-develop' into develop