don't choke on rebuilding cases that have been rebuilt before
Merge pull request #220 from dimagi/rebuild-choke

don't choke on rebuilding cases that have been rebuilt before
Merge remote-tracking branch 'origin/pretty-user-display' into autostaging