Upgrades to Rails 3.2
Merge branch 'master' of github.com:wellinformed/Ranger

Conflicts:
	Gemfile
	Gemfile.lock