I'm stylin' all over the place
Merge pull request #98 from efairbanks/master

Styled a bunch of stuff.