Vendor clean up, add back cm superuser for now and bootanimation for grouper