most of the basic signup is set up now.
Merge branch 'master' of https://github.com/MarkTonkinson/forever-planned

erge conflicts