added surround and supertab
removed neocompletion since it fucks up supertab