Misc merges
Updated to proper config definition for Cyprus Touch 236
Updated defconfig -- Working audio