number and nohlsearch
Merge branch 'master' of github.com:/clinstid/dotfiles

Conflicts:
	.vimrc