Defconfig: Updates

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>

Conflicts:
	arch/arm/configs/cyanogenmod_hercules_defconfig

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>