Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing

Proper resolv.conf parsing