Latest vimrc update (from php-dev)