Temp file to get heroku to run.
Added Unicorn web server.
Bundle install.
Move some gems around. Get database working.
change serve static assets to true in production env
Fix merge conflict.
Change github key and secret.
Delete temp file to force heroku to run.
Delete search js file from js manifest because it's already being required by the require_tree line.
Trying to get callback to work.