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

Conflicts:
	.travis.yml
Merge branch 'travis/master' into travis/next

Conflicts:
	.gitmodules