Changed Gemfile and Makefile