Use the travis config from github
Add contributors
update changelog
Merge branch 'master' into copypaste

Conflicts:
	CHANGES.txt