Merge branch 'master' into release/v1.0.0
Merge branch 'release/v1.0.0' into develop
Typographical
Serve higher-res gravatar images
Fix pseudo super users not being labelled as super users
Revert to using local CKEditor for configuration purposes.
Merge branch 'develop'