Set cursor line
Merge branch 'master' of github.com:tadejm/dotfiles

Conflicts:
	.vimrc
	Library/Preferences/com.googlecode.iterm2.plist