reverted back to stable master
Merge branch 'master' of https://git.heroku.com/sleepy-eyrie-7421