Removed oldvim!
Moved some things around.

Highlight is now in core, no need to split it out really. And moved the
list of bundles into it's own file.