This reverts commit 226554be.

Conflicts:

	config/locales/diaspora/en.yml

Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button.
Get rid of 500 error on the "view this invitation in your browser" link

e.g. if "test" exists and you try to follow "Test".

now that we have the 'read more' link in the stream, let posts be as long as the mysql character limit

http requests).

Revert "retry less"

This reverts commit 7784156e.

Revert "supress resque retries"

This reverts commit 80cdcd4e.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e5.

Conflicts:

	app/models/jobs/http_multi.rb

Delete all pending specs except stuff we actually want to fix in the short term. Add more useful comments to those.

- Do not error out on Reshare#fetch_post/after_parse if we get a 404
- Do error out if another error happens in Reshare#fetch_post/after_parse
- Retry failling receive jobs a few times

Refactor regular expression used to find tags so that it supports unicode in both ruby 1.8 and ruby 1.9. NEVER SPEAK OF THIS AGAIN.

This reverts commit 655558cb.

Revert "MS DG; for real this time?"

This reverts commit f85a047f.

Revert "MS DG; actually fix the bug"

This reverts commit cde12ec2.

Revert "fix small commenting email bug #oops"

This reverts commit a552fc80.

Revert "dont ban diasporahq  stuff"

This reverts commit 2c12b94e.

Revert "Merge branch 'participants'"

This reverts commit 74178018, reversing
changes made to abd211ba.

Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory.