Initial check in
Fix merge conflicts and update to work with heroku