readme [ci skip]
disable travis emails [ci skip]
Trigger travis build.
Merge branch 'master' into coveralls

Conflicts:
	.travis.yml