Add magnus defconfigs
Small reverts from merge
Add cyanogenmod defconfig