gem update
Spec fix
Merge branch 'gems'

* gems:
  Spec fix
  gem update

Conflicts:
	Gemfile.lock