Updating conda install on Travis
Merge branch 'master' into sim-explorer

Conflicts:
	.travis.yml