Errorpages

Duplicating Elizabeth's pull request -- hers is trying to merge `master` INTO `errorpages`, this one does the opposite (`errorpages` into `master`) so we can all keep using `master`.