Merge with rescued jon branch

Last attempt to merge these changes went south, so here's another attempt.

Adds signup and login pages