some formating and cleanup
fixed uid, and contact lookup

Contact picture caching is currently broken.  Not sure why.  Seems to
not work for the existing fql code as well, so some troubleshooting may
be needed with the vagrant setup of the machine.