Revert "Revert "Back to Cyanogenmod""

This reverts commit 36f98f983b9d4bfba07ec903592c0425e49c82ac.
Revert "Revert "Sort out casing for recent commit""

This reverts commit 779927476b64f4d56128244013f228d9885ad711.