Style changes and whatnot.
Merge branch 'master' of github.com:pleeschultz/joes