Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
Oh right, good point, but the point still stands about combining the `editBoluses` with the `appendBolusToWizard` since they both use the `joinKey`, just don't remove them.