This reverts commit a6f2f82c.

fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews

Use activerecord-import in ReceiveLocalBatch.  The default behavior of it is to do an On Duplicate Key Update updated_at = Time.now, but we have a test for that case anyway.

Vanna doesn't include helpers so we have to include them in views separately to use them. The absence of  this line was producing a deprecation warning for error_messages_for, because our helper redefines that method (it was removed from rails).

Use activerecord-import to re-save ServiceUser objects.  We should do the same in ReceiveLocalBatch.

actually displaying the facebook results(first time connection), updating attributes instead of discarding the changes

Addded Diaspora::Likeable module.  Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable.