Remove duplicate bundles.
Move old vimrc settings to separate files.