merge errors and a datetime fix
Merge pull request #32 from SandyWalsh/merge_fixup

merge errors and a datetime fix