pull in Dave's changes
fix merge conflict
merge with master
Merge branch 'master' into joy
pull in master changes
merge with master
Merge branch 'master' into joy
tweak burger distribution