Added logic to give the user the option to cancel or continue a sync if a request times out.  Refactored logic from the sync-cancelling branch.  Still testing.
Got rid of the extraneous sync failed dialog