Fixed issue with .env for Heroku.
Removed turbolinks.
Various changes with Todd.
Merge branch 'master' into develop