Disable hlsearch toggle

Also add log4j
Adding log4j
Merge branch 'master' of github.com:sentientmonkey/vimfiles

Conflicts:
	.gitmodules