Switched from Pathogen to NeoBundle
Disabled swap files
Merged upstream