Merge branch 'travis' of github.com:azmeuk/denemo into travis

Conflicts:
	.travis.yml
	tools/travis/install.sh