Extend dicts.merge to be (optionally) recursive
This is very useful when dealing for views that expect to be
inhereted from but wish to provide default values.
Patch by: Sverre Rabbelier
Fix form errors and hidden form errors
The conversion to django left out the 'prettyfying' of form and
hidden form errors, as these could occur when running live, restore
this behavior.
Patch by: Sverre Rabbelier