Updated to work with YouCompleteMe and Ultisnips