Make stock configuration a defconfig
merge changes from a repo I forgot existed