Cm 11.0 bring up

These changes should get cm 11 up and running. Let me know if there's any trouble