Configurable diff settings and various config updates
Merge branch 'master' into config-update
Updates to comments
Remove unnecessary columnWidth attribute