Change text_field to :login from :email in line with 9d92433a to allow login as admin or non-ldap user when ldap is enabled
Also change haml style in line with that commit

As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one.

Didn't bother with files in db/, config/, or features/