More devise rails 4 fixes