Added vim-preview, re-added delimitMate
Merge branch 'master' of github.com:jcelliott/dotfiles