Merged latest ultisnips plugin changes in w/ mine.