finished round 1, got rus and spm going
Merge branch 'master' of https://github.com/OHI-Science/ohi-webapps