Merge pull request #47 from justinsa/master

Cleaned all of the formatting funk
Merge remote-tracking branch 'upstream/master'