Merge pull request #10 from mastercoin-MSC/master

Sync to Master
fixes jsfmt overzealous cleanup
Merge pull request #483 from achamely/master

Fix jsfmt overzealous cleanup