column highlighting
Merge branch 'master' into statusline

Conflicts:
	.vimrc