update mocha
more gems updated
revert mocha and rake
Merge branch 'update_mocha'