More refactoring, redirect to /main on login
Merge branch 'master' of github.com:zencephalon/alphabet