Make first attempts to get the RC to work
Merge branch 'master' into rails-4-0-rc1

Conflicts:
	Gemfile.lock
Fix database rollback issue
Work around Rails 4.0 RC1 failure to allow assigning nil
Add some missing specs
Merge branch 'rails-4-0-rc1'