Updated various config files

.ssh/config

@@ -1,8 +1,6 @@
 Host phil lil tommy
   ForwardAgent			yes
-#  ForwardX11			yes
   ForwardX11Trusted		yes
-  HostName			%h.afterdark.lan
 
 Host bender bender.open-source.co.uk
   ForwardAgent			yes
@@ -25,12 +23,11 @@ Host full-* build-* clone-*
 Host *
   # AddKeysToAgent		yes
   ConnectTimeout		30
-# Removed as this prevents use of ^Z suspension.
-#  ControlMaster		auto
-#  ControlPath			~/.ssh/%u@%l->%r@%h:%p
-#  ControlPersist		7200
+  # Removed as this prevents use of ^Z suspension.
+  # ControlMaster		auto
+  # ControlPath			~/.ssh/%u@%l->%r@%h:%p
+  # ControlPersist		7200
   ExitOnForwardFailure		yes
-  ForwardX11Trusted		no
   SendEnv			LANG LC_* TERM
   # StrictHostKeyChecking	no
   # VerifyHostKeyDNS		yes