fix the mapping of ultisnips and add nerdtree-tabs
Merge branch 'ycm'