Make application deployable on Rackspace VPS.
Resolve merge conflicts in Gemfile.lock. Probably a bad idea.