Update .travis.yml

test 1-3-stable, 2-0-stable, 2-1-stable and master.
Conflicts:
	.travis.yml