Merge pull request #18 from calblueprint/noah__login

Working login and signup pages (no facebook)
add email to user signup form