Merge branch 'master' of github.com:rinx/dotfiles
Add vim-endwise
Merge branch 'master' into mac