Merge pull request #22 from systemallica/rebase-upstream

Rebase upstream

Author: systemallica

.gitignore

@@ -40,6 +40,7 @@ htmlcov/
 .tox/
 .coverage
 .coverage.*
+.coveragerc
 .cache
 nosetests.xml
 coverage.xml