Removed file left over from merge conflict. Removed S3 addresses since figured out that I was missing the heroku config keys thus the app couldn't access itself and there were 500 errors.