- added form for external 'diffchecker' tool
- added 'Redisplay' button that doesn't save merges, just redisplays
- made printing of HTML more uniform
- code cleanup