Feature/update rails

Updates rails and moves us to Ruby 2.1.1