Merge branch 'windows-installation' into 'master'

update Windows installation instructions to use Conda packages

See merge request !29
1 job for master in 23 seconds