Commit early, commit often (I have no idea what I'm doing)
Merge branch 'master' of github.com:saxonmatt/coffeehack