Keep manctl-specific stuff.
Fix overzealous cleanup.
Keep manctl-specific stuff out.
Merge branch 'manctl'