We should make signup part as painless as possible, refs #15
Merge remote-tracking branch 'origin/master' into staging