Undo #2899 by folding changes into error.spt
Merge pull request #2900 from gratipay/branded-errors

use branded page for error messages