Update travis.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	.travis.yml
Revert previous commit.
Merge branch '2.2'