formatting
updated my fork of php-extras
abbrev changes