Switched to NSUserDefaults when iCloud not available
Merged iCloud on-off detection
Re-added iCloud indicator in settings