doing some branch merging cleanup of defconfig and build files..

Signed-off-by: Bryan Smith <zarboz@gmail.com>