put filetype tab config together
Merge branch 'master' of github.com:halftan/dotfiles

Conflicts:
	.vimrc
no cursorline highlight when in terminal mode