preparation for change to Vundle.
More clean up.