update cloud storage sync links, rename inprogress to wip and remove inprogress-archive
Merge branch 'master' of https://github.com/chrischou/machinesetup

Conflicts:
	ubuntu/sysinstall.sh