Merge pull request #11 from eucalyptus/master

Pull changes from upstream
Adding DHCP to pre-check
Reworking error messages
Whoops, remove breakpoint
Merge pull request #33 from gregdek/master

Add DHCP check, rework error msgs