Static nameservers have precedence
Merge branch 'master' of https://github.com/NixOS/nixos into nameservers

Conflicts:
	modules/tasks/network-interfaces.nix
Merge pull request #147 from offlinehacker/nameservers

Static nameservers should have precedence