Merge branch 'conda' into 'master'

SGE scripts cannot be tested on the CI

See merge request !19
5 jobs from master in 7 minutes 41 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #120926
docker
build_linux_27

02:22

54.0%
passed #120927
docker
build_linux_36

02:10

53.0%
passed #120928
macosx
build_macosx_27

07:25

54.0%
passed #120929
macosx
build_macosx_36

06:58

53.0%
 
  Deploy
passed #120930
deployer
deploy_beta

00:16