Gemfile 'fixed'
bundle update ran, no errors
Resolve merge conflict.
Merge branch 'master' of https://github.com/ferretapp/ferret