comments and whitespace
use inferred const from stock app, set subtype, update tests and submodule
fix requisition test
memoize commtrack settings
add optional functionality to ota restore consumption as a stock block
delete cruft and use the updated models for consumption calc pillow
move try back to where it makes sense
add consumption calculation params to the ota restore logic