fixes to new wifi settings

works.  need to fix country code not sticking after boot.
but for now.. shhhhhhhhhhh ;)

Change-Id: I74268f893dabd6af0f967a1e7aaf0f5aa9932ab8