Don't restrict Travis builds to the master branch
Merge branch 'master' into no-jeweler

Conflicts:
	.travis.yml