Add better cscope support
Merge with current
Add useful aliases