Merge with upstream master

Author: raxbg

.travis.yml

@@ -16,4 +16,6 @@ matrix:
             dist: precise
             sudo: false
 before_script: rm composer.lock && composer install
-script: ./vendor/phpunit/phpunit/phpunit
+script: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
+after_script: ./vendor/bin/codacycoverage clover build/coverage/xml
+

composer.json

@@ -12,7 +12,8 @@
         "php": ">=5.3.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8"
+        "phpunit/phpunit": "~4.8",
+        "codacy/coverage": "^1.4"
     },
     "autoload": {
         "psr-0": { "Sabberworm\\CSS": "lib/" }