Updated travis.yml (2)
Merge branch 'feature_travis' of github.com:nhaarman/DashPinkpop into feature_travis

Conflicts:
	.travis.yml