Bring local repo up to date from clj-time

See whether the PRs against my own repo will still apply.