added tex settings
Merge branch 'master' of ssh://github.com/nbren12/dotfiles

Conflicts:
	vim/after/ftplugin/tex.vim
	vimrc
added abbrevs