Filter out IPv6 localhost on OS X
Merge branch 'osx-fix-ip6-localhost' into 2014.7-osx

Conflicts:
	salt/utils/network.py