Remove item_points annotations, and use user_points as points on neighborhood instead.

- Using multiple annotations is a hard problem that Django hasn't yet solved well. See https://code.djangoproject.com/ticket/10060. If we want to use both kinds of points, we'll have to do it manually in the future