Added time outs to iCloud access. Prevents a merge just blocking, causing an error instead.