updated rails, and incorrect respond_to :location calls.  you must supply an object with respond_with

Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know.

fixed user#move_contact. from/to aspects were incorrectly ordered in method call in aspect_controller.

Correct some queries, look at incoming requests in search,  explicit pending false in activate_contact

Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"

This reverts commit 2ac54eef, reversing
changes made to 3a136570.