little more robust fetching of state file to find the diff's timestamp
Merge pull request #24 from sletuffe/upstream

More robust fetch_osc_and_apply.sh