vim: update
setup/osx: fix mistakes