now using Pathogen for all modules
fix merge conflicts