Add make in shortcuts
Merge branch 'master' of github.com:rinx/dotfiles
Merge branch 'master' into mac