Parametrise git URL to watch
refactor vm-side heat scripts
Merge remote-tracking branch 'upstream/master'