Config changes
Merges changes, zapping flight-wifi.cfg changes for the local ones on laptop.