Refs #61 - cleanup for faster sync

* some more documentation and name changes, hoping to make things more clear
* avoided applying local changes twice (once local, once again after downloading
  them as remote changes)