diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..04303614
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,7 @@
+##### Expected Behaviour:
+
+
+##### Actual Behaviour:
+
+
+##### Steps to reproduce this issue:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..071fdf89
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+Fixes #[issue number] .
+
+Changes proposed in this pull request:
+
+- 
+
+- 
+
+- 
+
+@pihole/gravity
diff --git a/adlists.default b/adlists.default
index c2385f7e..cf5ca45b 100644
--- a/adlists.default
+++ b/adlists.default
@@ -6,12 +6,9 @@ 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
-
diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index 9153d9ba..ebed8684 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -88,6 +88,7 @@ function normalChrono(){
 		echo "        $(ifconfig eth0 | awk '/inet addr/ {print $2}' | cut -d':' -f2)"
 		echo ""
 		uptime | cut -d' ' -f11-
+		uptime -p
 		echo "-------------------------------"
 		# Uncomment to continually read the log file and display the current domain being blocked
 		#tail -f /var/log/pihole.log | awk '/\/etc\/pihole\/gravity.list/ {if ($7 != "address" && $7 != "name" && $7 != "/etc/pihole/gravity.list") print $7; else;}'
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index b8834951..1a021089 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -117,6 +117,7 @@ welcomeDialogs() {
 
 
 verifyFreeDiskSpace() {
+<<<<<<< HEAD
 	# 25MB is the minimum space needed (20MB install + 5MB one day of logs.)
 	requiredFreeBytes=25600
 	
@@ -130,6 +131,20 @@ verifyFreeDiskSpace() {
 		echo "Insufficient free space, exiting..."
 		exit 1
 	fi
+=======
+    # 25MB is the minimum space needed (20MB install + 5MB one day of logs.)
+    requiredFreeBytes=25600
+
+    existingFreeBytes=`df -lk / 2>&1 | awk '{print $4}' | head -2 | tail -1`
+    if ! [[ "$existingFreeBytes" =~ ^[0-9]\+$ ]]; then
+        existingFreeBytes=`df -lk /dev 2>&1 | awk '{print $4}' | head -2 | tail -1`
+    fi
+
+    if [[ $existingFreeBytes -lt $requiredFreeBytes ]]; then
+        whiptail --msgbox --backtitle "Insufficient Disk Space" --title "Insufficient Disk Space" "\nYour system appears to be low on disk space. pi-hole recomends a minimum of $requiredFreeBytes Bytes.\nYou only have $existingFreeBytes Free.\n\nIf this is a new install you may need to expand your disk.\n\nTry running:\n    'sudo raspi-config'\nChoose the 'expand file system option'\n\nAfter rebooting, run this installation again.\n\ncurl -L install.pi-hole.net | bash\n" $r $c
+        exit 1
+    fi
+>>>>>>> development
 }
 
 
@@ -599,21 +614,31 @@ runGravity() {
 	/usr/local/bin/gravity.sh
 }
 
+setUser(){
+	# Check if user pihole exists and create if not
+	echo "::: Checking if user 'pihole' exists..."
+	if id -u pihole > /dev/null 2>&1; then
+		echo "::: User 'pihole' already exists"
+	else
+        echo "::: User 'pihole' doesn't exist.  Creating..."
+		$SUDO useradd -r -s /usr/sbin/nologin pihole
+	fi
+}
 
 installPihole() {
 	# Install base files and web interface
 	checkForDependencies # done
 	stopServices
+	setUser
 	$SUDO mkdir -p /etc/pihole/
 	$SUDO chown www-data:www-data /var/www/html
 	$SUDO chmod 775 /var/www/html
-	$SUDO usermod -a -G www-data pi
+	$SUDO usermod -a -G www-data pihole
 	$SUDO lighty-enable-mod fastcgi fastcgi-php > /dev/null
 
 	getGitFiles
 	installScripts
 	installConfigs
-	#installWebAdmin
 	CreateLogFile
 	installPiholeWeb
 	installCron