Removed authlogic, added encrypted_password and salt