updated gemfile for heroku deployment
added database.yml back in for deployment
forgot asset pipeline flag
Merge commit '84ee5747678481b89c5dc2e8c07e64e83615e984'