Fixed some noquote stuff in form templates, fixed conflicts in default-master caused by the curriculum update and my bracketing of "if" exprs (failure to do so causes Tcl to compile the expr every time)
I added a check for whether the curriculum package is installed or not to the default-master.\nIf it is installed, the (possibly empty) bar will be included.\nThis won't fail even if there's no instance of curriculum mounted (knock wood)