Improve checksum and add watch cache dir path to salt config
Merge branch 'develop'