Update travis.
Merge branch 'master' of https://github.com/helgee/plyades

Conflicts:
	.travis.yml