some changes to try and get heroku working
Merge branch 'production'
removed force_ssl