Check if .tmp dir exists before creating

Don't clean the modules and tmp dirs on every push
Merge oskar's changes and restrict mass delete

Conflicts:
	puppet-sync