reset/update most of devise defaults
Merge branch 'master' of https://github.com/ballPointPenguin/blahblahblog

:q