Fixes to ultisnips and supertab complete