email settings tests, code cleanup
Merge branch 'v2' of github.com:neocities/neocities into v2