Use generic CyanogeMod variant
Fix NPE
Remove debugging stuff
Version bump