rubygem projects don't have Gemfile.lock
Merge remote-tracking branch 'drnic/no_gemfile_lock'

Conflicts:
	Gemfile.lock