Merge branch 'master' into tooltip

Author: dogeek

.appveyor.yml

@@ -10,6 +10,6 @@ install:
 build: off
 test_script:
   - "%PYTHON%\\python.exe -m pip install ."
-  - "%PYTHON%\\python.exe -m nose --with-coverage"
+  - "%PYTHON%\\python.exe -m nose --with-coverage --cover-xml"
 after_test:
-  - "%PYTHON%\\Scripts\\codecov.exe"
+  - "%PYTHON%\\Scripts\\codecov.exe -f coverage.xml"

.travis.yml

@@ -14,7 +14,6 @@ install:
   - python -m pip install nose coverage codecov mock pynput
 script:
   - python -m pip install .
-  - python -m nose
+  - python -m nose --with-coverage --cover-xml
 after_success:
-  - coverage run nosetests
   - codecov