fixes for heroku
redited applicaitons controller
Merge pull request #3 from TheFridge/tokens

Tokens