Improved usage of composer an phpunit.

Revert some changes.
Merge pull request #5 from blaugueux/master

Improved usage of composer and travis.