cleanup
Merge branch 'master' of https://github.com/calblueprint/feeding-forward