Merge pull request #89 from lakshmi-kannan/bf_refactor_for_various_rollups

WIP: Refactor code in preparation for pre-rolled metrics support
Main changes for supporting arbitrary rollups
Introduce base class Rollup and BasicRollup class for default stats rollup
Unit test changes
Integration test changes