Issue fixes

Fixes #454 and #323 
What's this in here for?  Doesn't rspec-rails get us mock_model and stub_model already?