Test update
Updated travis python-3.1 no longer supported
Merge branch 'master' into 0.8

Conflicts:
	.travis.yml