clean up mock strptime, on to the next task.
Merge remote-tracking branch 'origin/master'
derp