removed coffeescript gem that was bugging rspec
fixed gemfile merge conflict