Merge pull request #29 from GorillaApp/pretty

Make everything generally prettier
Merge remote-tracking branch 'origin/master' into more-gorilla-editor-testing