Add all ip's from resolv.conf to whitelist
Read lines directly from file
Force error message to be a string

Some third party modules may include non-serializable
objects in Exception.message.
Merge branch 'deployed'

Conflicts:
	adama/service.py
Forgot to resolve one more conflict