Bring Gemfile in locally
Lots of other changes