Merge branch 'master' into use_rvm
Remove 'zshcustom' shortcut
Merge branch 'use_rvm' of github.com:indrode/zsh-custom into use_rvm
Merge branch 'master' into use_rvm