Local files should not be updated if on an untracked branch
Rearrange fresh_update to have guards and error messages together
Merge branch 'non-tracking-local'

Closes #65

* non-tracking-local:
  Rearrange fresh_update to have guards and error messages together
  Local files should not be updated if on an untracked branch