Added two additional date formats to check for

Moved conversion to its own function.  Also added a unit test.
Is there a prettier way to do this than these nested try/except blocks?
Sorry about the whitespace changes, my editor removes trailing whitespace automatically on save.