Merge branch 'master' of heroku.com:mustachio
Merge branch 'master' of https://github.com/afeld/mustachio