Merge pull request #4 from gratzc/master

Lots more work on getting everything syncing and setup
Merge commit 'a1387bcf054f8f81a88bd75a2a44fe7684e325ba'