Removed type attribute that was being set to mojito-level profiles.
Moved some waterfall api logic to Waterfall static methods. Generating stats from actual waterfall gui objects such that the future merge method can leverage the methods that were moved.