working towards history stack
Merge branch 'master' of https://github.com/gwillad/syllabest
Merge branch 'chris'
Validations on user at a pretty-good, uniform point
Merge branch 'paul'
Merge branch 'chris'