If a write fails, don't assume it's a conflict.

A failed write attempts to reload the repo, causing an error if another is
already running. This change helps do less unnecessary reloads.
Merge pull request #171 from oerpub/avoid-running-two-updaters-v2

Avoid some remoteUpdater warnings
Merge remote-tracking branch 'origin/master' into avoid-saving-nav-on-load