updates and inflow

[Shane Caraveo]

I pushed some updates around contact handling and merging, importing
contacts now works much better, and as a bonus, as long as there is a
message to/from you with a display name when you sync, "Me" gets updated.

I also toyed with inflow demo, getting the menus from the tags api to
you can browse different groups, adding images for senders, a couple
other small things.

Shane