Repairing heroku merge
Merge branch 'master' of https://git.heroku.com/karmaguore into heroku