changed devise to use username as well as password