add leader-w; fix ultisnips again