Rails32 Fixes

Previously, I had added what I thought was a Gemfile for Rails 3.2 that Travis was running all our pull requests against.  This was pointed out to me, to not be true, by @iNecas and @daviddavis This pull request fixes broken unit tests and gets us green on both 3.0 and 3.2.