add tags
Merge branch 'master' of http://github.com/kino811/rc

Conflicts:
	.vimrc