There's a lot of stuff here that I think can be improved. I created an issue for general refactoring of rollup read/write https://github.com/rackerlabs/blueflood/issues/163

Let me know if we need to tackle this sooner than when dealing with that issue.