updated version
fixed issue where metrics were updating too slowly
changed default aggregation interval to 15 secs
keeping last historical data around
merged from develop