Add coverage to see how well the package is covered.
dist direcrory ignored
Merge branch 'master' into py3

Conflicts:
	buildout.cfg