Bundle update
Remove Mocha
Update RSpec ... RSpec-Rails to the big 3