Reorg and fix settings for Pathogen.