Fixed a serialization problem in the error handler.
Various fixups to templates on the web1 interface.
Merge branch 'master' of github.com:jamesread/upsilon