Add coveralls support
Add coveralls support
Merge branch 'coverage' into coverage_travis

Conflicts:
	.travis.yml