Reworked error message

Devise generates an error message in the settings page, changed this to
shorter message.
Also did a tiny spell correct!
settings page
spelling in devise edit
resolved conflicts