Clean up whitespace
Add useful cscope defaults
Merge branch 'cscope'