Remove color files. To be replaced with vundle definitions
Move things around
Cleanup