nolansock and serverautomaster options, maprotation fixes, some cleanups