Reorder items on settings page and improve wording
Update cukes to be text-independent
Update changelog
Merge pull request #4912 from goobertron/settings

Reorder items on settings page and improve wording