Fixes for a more robust screen

We might be missing dns settings etc, so
make the computers act more robustly
Merge branch 'master' of github.com:hirenj/raspberrypi-bootstrap

Conflicts:
	wlanconf-copy