Change for how vim behaves with both number and relative number set
Merge branch 'master' of github.com:muff1nman/Vim

Conflicts:
	vimrc