Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
Oh, and I'm going to create some boluses without joinKeys in the demo data so we can test this quick bolus vs. wizard bolus.