Updated to PHP 5.5.8, cleanup, added xdiff

Also add use homebrew curl, version bundled with Mac OS X Mavericks has
issues with certificates.