Fix cask-related errors
Capture all steps needed for installing new Ruby version
Use 4 threads for bundle install
Add 'tree' package
Work around a lack of a brew cask upgrade task
Eliminate error message during brew cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bashrc
	bin/brew-install
Oops, removed extra macvim