login.html has been causing merging problems: I'm moving my copy to "login_old.html" to help resolve them