changing templates to handle dates not nested in unitdate, fixes #43; adding logic for commas between dates, fixes #6