changed .travis.yml
changed .travis.yml
added composer.lock
changed phpunit options
update from the main branch
moved phpunit settings
Merge pull request #11 from mimmi20/master

changed settings for PHPUnit and travis-ci