fix some errors
failing on assert_kind_of
delegate to RSpec instead of hacking with Minitest
cleaned up
fixed merge conflict
Merge pull request #1 from jbodah/rails_4

Rails 4