This commit is the first merged hosts file to utilize the updateHostsFile.py script.
The only working difference is that it pulled in a new someonewhocares.org hosts file.
updateHostsFile.py can handle either simply combining local hosts files you have checked in, or it can
go out to the Internet to update your source files. It also handles automatically generating a header
and removing duplicates from the list.