Changed php-diff dependency to use code from master (they haven't tagged changes we need yet)
Merge pull request #1121 from mongosoft/master

Missing return statement
Merge pull request #1123 from mongosoft/master

Typos
Changed the exit status to normal.