More ultisnips and neocomplete stuff, plus re-removed those commented blocks