Refs #61 - faster sync

Sync first time should now be faster. This still needs some
testing, and maybe some refactoring as well.
Merge pull request #63 from johanv/61-faster-sync-pr

Closes #61 - faster sync