Merge pull request #46 from DavidVorick/master

Whitespace, penalties, dishonest blockchains
Merge branch 'master' of github.com:Siacoin/Sia into rsc