Merge branch 'release/0.1.0.0' into develop
start new development cycle
Refactor config/ directory

* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User
Merge pull request #4145 from MrZYX/refactor_config_directory

Refactor config/ directory
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
use ActiveRecord#find_each to prevent memory spikes in our workers
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
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