Merge branch 'hotfix/0.0.3.4'
change version to 0.1.0.0
Merge branch 'release/0.1.0.0'
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
use ActiveRecord#find_each to prevent memory spikes in our workers
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
Merge pull request #2 from diaspora/develop

Develop