New pathogen-based Vim config
Fixed merge problem