Add a hook to replace make_resolv_conf with an empty function

This avoids overwriting the current resolv.conf every time the virtual machine is powered on by hooking in to the dhclient-script process
Move dhclient-enter-hooks to webserver state file

We'll want this on both the production and development web servers. It's possible that this should move to the general server at some point. It's also possible that we'll replace Google's DNS numbers with something inside the University as well.
Merge branch 'master' of github.com:washingtonstateuniversity/WSUWP-Environment

Conflicts:
	provision/salt/devserver.sls