Fix g:phpfmt_options problem and fit for phpcbf version 3#6

zurazurataicho wants to merge 2 commits intobeanworks:masterbeanworks/vim-phpfmt:masterfrom

zurazurataicho:masterzurazurataicho/vim-phpfmt:masterCopy head branch name to clipboard