Phpspec2

Merge in upgrade to PHPSpec2 from PHPSpec1