Refactored out the Canvas, Assupmtion and Funnel code
Commented out the Google Analytics and Chart APIs to allow faster load (we still need to remove a bunch of templates)