Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)
Now with passing Cucumber tests
Remove duplicate test steps
Merge pull request #4682 from goobertron/NSFW_profile_text

Change NSFW explanation on profile settings page
Remove background from badges in header
Merge pull request #4692 from svbergerem/header-fix-badge-background

Remove background from badges in header
Merge remote-tracking branch 'upstream/develop' into pod.jpope.org