Merge @paulyg commits.

This commit merges parts of:

https://github.com/paulyg/Vim-PHP-Stuff/commit/b9b2b2daaace6cd81f3989a77f93be3c503a0933
https://github.com/paulyg/Vim-PHP-Stuff/commit/e3333be231cc01ad4dbfebfa852706cb05a51cdb
Extend PHP to use Java-like syntaxing highlighting (via @tetsuo13).

This commit merges parts of:

https://github.com/vim-scripts/php.vim--Nicholson/commit/9d1e381f03e5ff0e1267caf1c601eb87d66749ec