update release history
Version bump to 2.2.0
Regenerate gemspec for version 2.2.0
travis conf
test against rails 4.0.0
fix mocking deprecations
travis - add gemfiles for rails 3.0 and 3.2
travis - dont test rails4 against ruby 1.8
travis - use symbol for specifying rubygems as gem source
travis - try https for rubygems
travis - remove path specification in gemfile
typo
testing against ruby-head no longer works on travis
travis - dont test against REE and rails40
fix broken travis image in readme
update readme to include rails 4
Merge remote-tracking branch 'upstream/master' into mongoid

Conflicts:
	Gemfile.lock
	spec/db/test.sqlite3
Merge remote-tracking branch 'upstream/master' into mongoid

Conflicts:
	Gemfile.lock
	spec/db/test.sqlite3
Update travis.yml to add mongodb services