mesa-libgl: New module to handle libGL conflicts.
mesa-lib: Don't install libGL direclty.
NVIDIA: Updated CONFLICTS with mesa-libgl
Moved xorg aliases over from other to xorg.