fixing gemfile
merge
more deployment prep stuff