Fixes for vim setup script