Better interface for funnel queries, with optional params.  Cleaner code too.
Merge branch 'master' of github.com:StreakYC/StreakDeveloperTools