refactor of historic sync. Handles all know scenarios
Merge pull request #360 from matiu/feature/handle-resyncs

refactor of historic sync. Handles all know scenarios