still renaming vars
Merge branch 'master' of github.com:OHI-Science/ohi-webapps