Merge @aantonello commits.

This commit merges parts of:

https://github.com/aantonello/php.vim/commit/9d24eab4ea4b3752a54aebf14d3491b6d8edb6d8
https://github.com/aantonello/php.vim/commit/63c93d88253e5a93f46d04a3c363c61b12861b34

The syntax file is more closely aligned with the generic syntax highlighting
groups in Vim.

This didn't change highlighting for my custom syntax colours, hopefully it
will not affect others as well.
Merge @pixelastic commit.

This commit merges parts of:

https://github.com/pixelastic/php.vim/commit/8b4b165bab59fba80efda8dbe0e431605ab94669
Merge @joshtronic commit.

This commit merges parts of:

https://github.com/joshtronic/php.vim/commit/e9c5d0f6be019be3e5c37c3ef63994adeb4c125d

The 'finally' keyword was added to the list of recognised keywords.
Update template file and re-generate using PHP 5.5.7

$ php -v

PHP 5.5.7-1+sury.org~saucy+1 (cli) (built: Dec 12 2013 21:54:59)
Copyright (c) 1997-2013 The PHP Group
Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
    with Zend OPcache v7.0.3-dev, Copyright (c) 1999-2013, by Zend Technologies
    with Xdebug v2.2.3, Copyright (c) 2002-2013, by Derick Rethans
Add 'yield' to the list of keywords (as of PHP 5.5).
Highlight booleans as 'Boolean'.
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
Merge branch 'master' of https://github.com/StanAngeloff/php.vim

Conflicts:
	syntax/php.template
	syntax/php.vim
Added Static class and docblock highlighting

This is actually a rework of the patch @kris89 sent in that adds the syntax to the php.template file so they won't be lost when regenerating the php.vim file. Thanks @kris89 !!
Added improvement to the README
Merge branch 'master' of https://github.com/kris89/php.vim

Conflicts:
	syntax/php.template
Stop phpDocParam highlight leakage

Problem:  The new Java-like syntax highligting added phpDocComment, et
al.  However phpDocParams highlighted indented html tags in a file with
no doc comments.

Fix: Mark phpDocParams as contained, so phpDocParams must reside in
phpDocComments to receive vim highlights.

Signed-off-by: Justin Charette <charetjc@gmail.com>
Merge remote-tracking branch 'boxofrox/fix/php-tag-recognition'
Restore spell-checking in docblock comments.
Fixed issue with static classes with numbers

Inadvertently also resolved issues with static classes with underscores as
well. Thanks to @kris89 for giving me a head's up where to look. Closes #2
Added test_helpers functions

For all of my friends that are good about unit testing and use the test_helpers
Updated against PHP 5.5.8

Updated README and updated against the latest PHP version.
Enabling more modules

I don't see the need in selectively including syntax for modules when I can
just install the modules and include them all. Expanded to include all of the
modules I could that were in the list already and updated. Going to look into
getting a more up to date module list for PHP 5.5+ and expanding further.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	syntax/php.template
	syntax/php.vim

Attempted to merge in upstream changes as they claimed to have fixed an issue
that broke spell checking presumably introduced by my branch. I was unable to
get spell checking working with the syntax file that was part of my original
fork: https://github.com/StanAngeloff/php.vim/commit/36ccde52967f56ea0eed2f8a1fe6d1236cc1df96

Because of this I left my script as is in favor of highlighting just the
@attribute part of the docblock and not highlighting the entire comment string
which appeared visually awkward to me. Ideally I'd love to get spell checking
working in all the places that it should be working but that seems to be a
bigger issue all together.

Also added support for the @usage attribute as it's something that is fairly
common albeit not standard docblocking