delete /usr/bin/gem update
Merge branch 'master' into update_gem_commands

Conflicts:
	bootstrap.sh