Merge templates

Signed-off-by: Matt White <matt@londc.com>
Add delete function to timeslots to fix #15

Signed-off-by: Matt White <matt@londc.com>