Minor macports and vim fixes
Merge branch 'master' of https://github.com/abates/dev-env