Merge branch 'hotfix/0.0.3.4'
Merge branch 'release/0.1.0.0'
Add tweet_id column to post
Twitter service removes status from twitter when post is revoked
Fix dispatcher_spec to depend on Tumblr which isn't retracting
Service.delete_post now more generic, for future implementations

Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)
gracefully handle unavailable git in script/server
Fix 500 caused by deleted reshares
federate location
Changelog and version number for the hotfix
Merge branch 'hotfix/v0.1.0.1' into develop
Fix #4157: post preview from tag pages
drop fallback donation form
bump Typhoeus and refactor HydraWrapper
Merge pull request #4177 from svbergerem/4157-post-preview-tag-page

Fix #4157: post preview from tag pages
Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop

Conflicts:
	Changelog.md
bump redcarpet, should fix #4104
strip trailing newlines from stripped markdown
Fix tags ordering in chrome
Merge pull request #4133 from diaspora/fix_tags_ordering

Fix tags ordering in chrome