Minor fixes; clean unnecessary files out of vm-tools before packaging.