Upgrade PHPUnit to the latest stable version (4.1)

Closes #466
Cleanup of PHPCI dependencies in composer.json

Closes #490

Update composer.json
Merge fails