Added sign up form and gravatar to user profile.
Updates to the sign up page
Finish user sign-up
Fixes a merge conflict