Bundle update & switch to Ruby 2.1.2
Must specify a relative path to unicorn config
Merge branch 'feature/heroku_cedar'