include quinn's algos
Merge branch 'master' into integrate_food_sources