Fix deprecation error and warning in test suite

This change makes it possible to run the grit test suite against new versions of rdoc and removes the warning that shows up when running the tests against new versions of mocha.

The change retains the ability to have the test suite run against the older gem versions.

Please consider merging this to make it easier to keep grit up to date.

Thank you very much!