Add timeout to DeckTask.waitToFinish() to prevent hanging at start of sync
Merge pull request #655 from timrae/syncErrors

Add timeout to DeckTask.waitToFinish() to prevent hanging at start of sync