adding a bunch of format changes
Merge pull request #5 from sbjustin/master

Lots of formatting changes