whitelist grooveshark's cdn
whitelist lifehacker domains
Merge branch 'master' of github.com:BrettRasmussen/sentinel

Conflicts:
	etc/squid3/acls/whitelist.txt