updated gem environment
Merge branch 'master' of https://github.com/palf/bdd-elements

Conflicts:
	Gemfile.lock
ran bundle update