Added rought support for resolving conflicts when a file is updated remotely
Added conflict-resolution to OPF file
Add a hook to merge local changes into the reloaded model
Shortcut to not override local changes if remote model did not change
override onReloaded to resolve conflics between local changes and remote
simplify saving a little bit
Save multiple files in one commit
Simplify the conflict retry code
Re-prepend new content when the navigation file changes remotely
Merge remote-tracking branch 'origin/github-refactor-oerpub' into phil-remote-update

Conflicts:
	scripts/gh-book/remote-updater.coffee
version bump for octokit
Configure copy plugin's path determining method.
Merge pull request #11 from oerpub/phil-remote-update

poll for and display remote changes to nav files