Missing zipline/data...
setup poorly fixes
Merge branch 'develop'