Merge branch 'hotfix/simpleop'
Comment out call to make_config_py

This call seems to confuse pip.
Merge branch 'hotfix/pypi' into develop