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