Make my vimrc into one file again
Delete obsolete files