Waterfall summary now makes use of the popup module.
Added new methods to time module, added Waterfall.merge method.