Use single quotes in Gemfile
Merge in latest changes
Fix conflicts