More DISPLAY_IP checks
Make `maillog` and `mtalog` data mergeable in Total Messages by Date report

closes #108
Merge branch 'master' of https://github.com/mailwatch/1.2.0
Merge branch 'master' of https://github.com/philrandal/1.2.0