gem updates and mock additions needed to get the tests to pass on edge rails
Merge pull request #1071 from twalpole/rails_edge_errors

gem updates and mock additions needed to get tests running on edge rails