switch to chruby
Merge remote-tracking branch 'origin/master' into osx

Conflicts:
	vim/vimrc
	zshrc