Fix taggatron config
Merge branch 'master' of github-serebrov:serebrov/vimrc

Conflicts:
	.vimrc