Require user email to match pattern

This provides a test and code to ensure that email addresses are more
like an address than simple text.  It is not robust, but makes them
more like an email address than previously.

Conflicts:
	app/models/user.rb