This reverts commit 0f56ee7b.

refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471

This reverts commit 8a275682, reversing
changes made to 31ef2d60.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb

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