Update to new Ultisnips API

* Fixes #415
Merge pull request #423 from Keithbsmiley/ks-ultisnips-fix

Update to new Ultisnips API