Fixed for OSX, updated vim plugins