Update Travis config
Update Travis config
Merge branch 'master' of https://github.com/BlueBrain/dash

Conflicts:
	.travis.yml