Remove ruby version lock
Update gem grouping
Merge pull request #5 from gouf/gem_update

Gem update
Merge branch 'master' into transpec

Conflicts:
	Gemfile