Update rails to 3.2.20
add ruby-gemset and ruby-version
Merge branch 'master' into stable

Conflicts:
	Gemfile.lock