trying out cursorline
Merge branch 'master' of https://github.com/pfries/dotfiles

Conflicts:
	vimrc
exclude .orig files