Updated vim plugins
Merge branch 'github' of github.com:chrislaskey/.dot-files into github