Bump rails version + remove default test::unit directories.
Merge branch 'master' into dev-admin

Conflicts:
	Gemfile
	Gemfile.lock