Getting things organized
Merge branch 'master' of https://github.com/squiffy/Masochist