Simplified travis builds (external setup scripts)
More straightfoward travis include/exclude
Merge remote-tracking branch 'origin/3.1'

Conflicts:
	.travis.yml