updated to use mysql locally, also added the heroku gem
updated editing user to work, since it didn't seem to be
Added city to solr search
Got Gmail import contacts working, and Facebook authorization working.