add travis integration
Merge branch 'travis/maint' into travis/master

Conflicts:
	.travis.yml