Rails 3.2.19
Fix deprecations for RSpec 3
Update only the necessary gems
remove windows stuff
Rails 3.2.21 is out, update only the necessary gems
Introduce new argument, fix some deprecations, update Capybara
Remove unnecessary require spec_helper, prevent polluting Kernel
remove windows stuff
Minor edits to specs
Merge branch 'rails3.2.19' into rspec3

Conflicts:
	Gemfile.lock
Merge branch 'rspec3' into cancancan

Conflicts:
	Gemfile.lock