Heroku testing
Handle already logged in users
Got rid of heroku-specific files