Simplified David O'Callaghan's vim files.

I don't want all of his extensions. I'll stick with just the core
features.

Also modified color scheme to match mine better.