Change around a few plugins, add easytags
Merge branch 'master' of https://github.com/milch/dotfiles

Conflicts:
	vim/vimrc