Search for highlighted text
Settings
Merge branch 'master' of github.com:joshaw/dotfiles2

Conflicts:
	vim/vimrc