Fix devise/clean up old User stuff

Any comments?  I'll leave this open for a bit.