Added tex snippets and formatting in vimrc
Merged origin/master with MacBook