Enable filetype and syntax at the end of .vimrc.

Local overrides might affect their function.
Stop disabling and enabling syntax highlighting in CS_vimrc.  If that breaks
anything I'll investigate why.
Merge branch 'master' of github.com:tobinjt/dotfiles