Switch to ultisnip; improvements