additional config files and changes to vim bundles
Merge branch 'master' of github.com:dmerc/dotfiles
oops