Merge remote-tracking branch 'refs/remotes/origin/work' into work

dotfiles/gnupg/gpg-agent.conf

@@ -1,4 +1,3 @@
-enable-ssh-support
 use-standard-socket
 default-cache-ttl 7200
 default-cache-ttl-ssh 7200

dotfiles/profile

@@ -5,7 +5,12 @@ if test -f $GPG_AGENT_INFO_PATH && kill -0 `cut -d: -f 2 $GPG_AGENT_INFO_PATH` 2
   export GPG_AGENT_INFO SSH_AUTH_SOCK SSH_AGENT_PID
 else
   if which gpg-agent >/dev/null 2>&1 ; then
+    if [ -z "$SSH_AUTH_SOCK" ] ; then
       gpg-agent -q 2>/dev/null || eval `gpg-agent --daemon --enable-ssh-support --write-env-file $GPG_AGENT_INFO_PATH` 2>/dev/null
+    else
+      gpg-agent -q 2>/dev/null || eval `gpg-agent --daemon --write-env-file $GPG_AGENT_INFO_PATH` 2>/dev/null
+    fi
+  export GPG_AGENT_INFO SSH_AUTH_SOCK SSH_AGENT_PID
   fi
 fi
 unset GPG_AGENT_INFO_PATH

dotfiles/ssh/config

@@ -2,6 +2,9 @@
 # Never fall back to protocol 1: it's broken
 Protocol 2
 
+Host scoreboard
+  Hostname 104.131.136.220
+
 # Defaults (May be Overridden)
 Host *
 	ControlMaster 	auto