fix circular dependency
Merge pull request #219 from dimagi/fix-circular-dependency

fix circular dependency
Merge branch 'pretty-user-display' into autostaging