Updated for linux. Removed OSX-based modifications
Reorganized file. Added Pathogen and Powerline support