Fix for issue-1039

In reference to: https://github.com/MarkUsProject/Markus/issues/1039
Can once again run the rails server after these changes to the gemfile and usage of the mocha gem in the test files. See https://github.com/freerange/mocha for information on new usage. Changes have been made to avoid the deprecation warning listed on that page.