updated rspec to 2.12 and updated Gemfile.lock
Update from Merge
updated Gemfile.lock after merge