1st pass, beta site logic
Merge branch 'master' of https://github.com/reyne/automaton
validation form fix