Use desert theme by default.  Correctly load cscope when available.
Merge branch 'master' of github.com:sebastient/vim