Changed php-diff dependency to use code from master (they haven't tagged changes we need yet)