styling, etc
Merge branch 'master' of https://github.com/rubinz/mash-hacks