Bump versions for release
Does not use pypi mirrors in travis because they were causing slow builds
Merge branch 'master' into develop

Conflicts:
	CHANGES.rst