vim cursor position after select
Merge branch 'master' of https://github.com/thasso/dotfiles

Conflicts:
	zshrc