style fixes -- back to church and state
be cool bro
Merge branch 'master' into gh-pages