Merge branch 'master' of https://github.com/elreplicante/sack

* 'master' of https://github.com/elreplicante/sack:
  Updating heroku config
Merge branch 'master' of https://github.com/elreplicante/sack

* 'master' of https://github.com/elreplicante/sack: