Merge pull request #12 from josmas/master

Config changes for heroku