trying to fix heroku
Merge branch 'master' of https://github.com/kylesza/VaultOfGlass