Allow :require => false in Gemfile and fix mocha deprecation warnings with riot
Merge pull request #1384 from kgfullerton/mocha_fixes

Fix mocha deprecation warnings with riot and change insert_into_gemfile to allow :require => false