Change some plugins, fix vim aliases
Merge branch 'master' of github.com:datashaman/dotfiles

Conflicts:
	home/.vim/.netrwhist
	home/.vimrc