Merge branch 'SimpleDMR' into AX25_FM

MMDVM.ini

@@ -13,12 +13,6 @@ Daemon=0
 RXFrequency=435000000
 TXFrequency=435000000
 Power=1
-Latitude=0.0
-Longitude=0.0
-Height=0
-Location=Nowhere
-Description=Multi-Mode Repeater
-URL=www.google.co.uk
 
 [Log]
 # Logging levels, 0=No logging
@@ -202,10 +196,8 @@ Debug=0
 Enable=1
 Address=44.131.4.1
 Port=62031
+Local=62032
 Jitter=360
-# Local=62032
-Password=PASSWORD
-# Options=
 Slot1=1
 Slot2=1
 # ModeHang=3
@@ -319,11 +311,7 @@ UTC=0
 Enable=0
 File=/tmp/MMDVM_Active.lck
 
-[GPSD]
-Enable=0
-Address=127.0.0.1
-Port=2947
-
 [Remote Control]
 Enable=0
+Address=127.0.0.1
 Port=7642