Converted .gems to Gemfile.
Merge branch 'master' into tumblingowl

Conflicts:
	Gemfile