Remove commented gems from the Gemfile
Merge branch 'master' into rails4

Conflicts:
	Gemfile