Data storage timer bugs: (1) upload timer kept being reset (2) new idle timer to flush 

Some trivial fixes for 2 edge cases, one is where collections keep happening and the upload timer keeps getting pushed back by rescheduling, the other where there are collections in memory that aren't being flushed to disk because stumbler is idle and there is no wifi.

Also, bundled in a few cleanup items with this PR.