Don't require minitest/spec in the spec helper (it's redundant)
Merge branch 'master' into rspec

Conflicts:
	spec/spec_helper.rb