Merge pull request #156 from stheno/master

* Temporary fix to troubleshoot Save() if this helps fix some desync and...
Merge pull request #157 from stheno/master

* More desync tests
* Forage and fishing desync test fix as well.