Merge branch 'conda' into 'master'

SGE scripts cannot be tested on the CI

See merge request !19
5 jobs for master in 4 minutes and 22 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #121322
docker
build_linux_27

00:02:29

54.0%
passed #121323
docker
build_linux_36

00:02:17

53.0%
passed #121324
macosx
build_macosx_27

00:04:05

54.0%
passed #121325
macosx
build_macosx_36

00:03:58

53.0%
 
  Deploy
passed #121326
deployer
deploy_beta

00:00:12