removed snipmate
added ultisnips, updated vimrc