Changes per review https://github.com/DoSomething/gambit-conversations/pull/325#pullrequestreview-120406456
Changes per review https://github.com/DoSomething/gambit-conversations/pull/325#pullrequestreview-120406456

DoSomething/gambit,DoSomething/gambit