Merge 0.3 branch and revert BC commits

This reverts some of the changes implemented in #4 for the 0.3 branch. It leaves the PHP binary detection, since that improves HHVM test compatibility.