Turn off highlighting
Updated color scheme to not change background
Tab movement
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc