fix no chef_domain in zero mode
bash: do not rely on ~ expansion in PATH
mac: remove broken app store support
only load rvm if it isn't loaded already
rvm: do not update or downgrade by default
remove debug code
use any ruby 2.1
update bundle
Merge branch 'upstream'

Conflicts:
	Gemfile.lock
	cookbooks/bash/recipes/default.rb