Clarify explanations and defaults in diaspora.yml.example
Removed stats hub address, other minor tweaks
Revert so defaults are now placed in commented out settings
Merge pull request #5088 from goobertron/defaults

Clarify explanations and defaults in diaspora.yml.example
Set top margin only on the body element
Merge pull request #5108 from blase/feature/5107-set-top-margin-on-body

Set top margin only on the body element
Terms of service and privacy policy feature.
If enabled, terms of service link will be shown in sign up page.
Merge branch 'develop' into iliketoast
Merge branch 'tos' into iliketoast

Conflicts:
	.gitignore