fixed authentication tangle forcing heroku users to log in as Corey through linkedin
merged files