preps for using tags
Merge branch 'master' of https://github.com/dengdal/dotvim

Conflicts:
	vimrc