Fix merge conflicts after merging v0.2.2 branch

Signed-off-by: Tom Van Herreweghe <[email protected]>

Author: Tom Van Herreweghe

.gitignore

@@ -1,3 +1,4 @@
 phpunit.xml
 tests/log
 vendor
+composer.phar

.travis.yml

@@ -13,6 +13,7 @@ script:
   - mkdir -p build/logs
   - php vendor/bin/phpunit -c phpunit.xml.dist
   - ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
+  - ./vendor/bin/phpcs --standard=PSR2 ./lib/
 
 before_script:
   - composer install --dev --prefer-source