Update tag generation script
Merge branch 'master' of github.com:medvid/vimfiles

Conflicts:
	tags/gen.sh
Update vimrc