fix for boluses that haven't completed when an upload occurs and some tweaks required for jellyfish
infer carbRatio from broken-out bolus wizard estimates and update unit tests accordingly
Merge pull request #28 from yrrebnarg/master

changes required to integrate with jellyfish