Fixed more merge issues. Log file timestamp now rolls back to nearest hour/day depending on format. Fixed bug with date formatting causing issues.