some more style stuff
Merge branch 'master' of github.com:Techwraith/scotch