Updated delimitMate and ultisnips bundles. Changes to vimrc