vimrc: Update vimrc plugins
Merge branch 'master' of github.com:LehmRob/dotfiles
emacs.d: Update Emacs files
Merge branch 'master' of github.com:LehmRob/dotfiles

Conflicts:
	.emacs.d/lehmrob/global.el