Fixed conflicts
Improved phpunit bootstrap and instructions.
Renamed suggests to suggest.
Fixed conflicts.