More robust wifi config
Merge branch 'master' of git://github.com/cocoabird/RaspberryPiConfig

Conflicts:
	node_macs