Infinite update bug fix
Merge remote-tracking branch 'origin/master'
Infinite update bug fix
Ignore changes in local FS, while consolidating changes from remote host.
Merge pull request #48 from johnnyFiftyFive/master

Infinite clock increment and changes ignore