Merge pull request #85 from mastercoin-MSC/master

Sync to Master
cleanup spacing/naming
Merge pull request #1041 from achamely/master

Additional spacing / naming updates