adds dockblock update
Merge branch 'master' of https://github.com/kris89/php.vim

Conflicts:
	syntax/php.template