New plugins, map and autocmd adjustments
Merge branch 'master' of https://github.com/ndreynolds/dotfiles

Conflicts:
	vim/vimrc