Added a time based portion to progress bar on re-sync
Merge remote-tracking branch 'upstream/master'
Merge pull request #26 from jarridgraham/master

Added a time based portion to progress bar on re-sync