add cedet support, complete words,funcs,etc.
fix conflict