move devise entries back into devise yml and add interpolation variable ...

...for username to close #1040