Make setup.py develop work
Merge branch 'setup-develop' into init-ensemble
ensemble passing