Multiple dev-php/hhvm instance support and some other small changes.