biggish commit on style. Fixes #13 #34 #36 #37
Merge pull request #41 from fusion94/master

Changes to support the 1.0 release