Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity

Conflicts:
	automated install/basic-install.sh

adlists.default

@@ -5,4 +5,4 @@ http://www.malwaredomainlist.com/hostslist/hosts.txt
 http://pgl.yoyo.org/adservers/serverlist.php?
 http://someonewhocares.org/hosts/hosts
 http://winhelp2002.mvps.org/hosts.txt
-http://mirror1.malwaredomains.com/files/justdomains
+http://mirror1.malwaredomains.com/files/justdomains