Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
@ianjorgensen My first comment/question in this thread (re: plot types in the bolus pool) still stands. I might try to write the tests today/tomorrow to make sure we have all expected bolus types (with and without joinKeys) coming through, and no duplicates.