First pass at refactor for insights#1748

pims wants to merge 2 commits intomasterhello/suripu:masterfrom

tim-insights-refactorhello/suripu:tim-insights-refactorCopy head branch name to clipboard