Local changes to date

* Modified to be more likely to be able to keep current via upstream
Prune remotes on rebase