Make sure all the files are properly handled by distutils
Set proper socket names
Clean up trailing spaces