add vimairline
Merge branch 'master' of https://github.com/kkkgg/dotfiles

Conflicts:
	.vimrc
update