Match gnome-settings-daemon device naming more closely.

These two commits will make xiccd's device naming match gnome-settings daemon, so automatic matches are found for profiles created with gnome-color-manager.