Merge pull request #5 from uberlaggydarwin/cm-11.0

merge into cm11
fix derpy build that i broke
fix build