Merge username and email into a single form input

This is a possible fix for #132: use a single text input on the login page, try to match against username, then try to match against email if that fails.

This represents the first couple of lines of PHP that I've written in a *long* time, and I'm unfamiliar with the architecture, so it's a sketch of the solution.  Please review ;-)