updates
ignore case when tabbing
removed external diff tool
Merge branch 'work-computer'

Conflicts:
	.vimrc.bundles.local