Patch be Matt Westgate:

- Bugfix: in the user_admin_edit() function, the data array returned from the callback modules was not being merged into the edit array.

- Bugfix: added enctype="multipart/form-data" to the form tag so that we can update things like the avatar image in the admin interface.