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

adlists.default

@@ -6,3 +6,12 @@ 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://securemecca.com/Downloads/hosts.txt
+https://hosts.neocities.org/
+http://sysctl.org/cameleon/hosts
+https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist
+https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
+https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
+http://optimate.dl.sourceforge.net/project/adzhosts/HOSTS.txt
+https://raw.githubusercontent.com/quidsup/notrack/master/trackers.txt
+

automated install/basic-install.sh

@@ -145,10 +145,8 @@ chooseInterface() {
 		echo "::: Cancel selected, exiting...."
 		exit 1
 	fi
-	
 }
 
-
 use4andor6() {
 	# Let use select IPv4 and/or IPv6
 	cmd=(whiptail --separate-output --checklist "Select Protocols" $r $c 2)
@@ -467,7 +465,6 @@ update_repo() {
 	echo " done!"
 }
 
-
 CreateLogFile() {
 	# Create logfiles if necessary
 	echo ":::"
@@ -519,7 +516,6 @@ runGravity() {
 	/usr/local/bin/gravity.sh
 }
 
-
 installPihole() {
 	# Install base files and web interface
 	checkForDependencies # done