add fighlight setting
Merge branch 'master' of https://github.com/joe1014/dotfiles

Conflicts:
	vimrc