fix ultisnips
Merge branch 'master' of github.com:reedboat/my-conf