Seperate personal and BigPanda GitHub accounts.

.ssh/config.d/20_bigpanda

 # BigPanda servers
 
-Host prod-* stage-* ec2-* staging* ci.bigpanda.io demo*
+Host prod-* stage-* staging* demo* *.bigpanda.io
 User ubuntu
 IdentityFile ~/.ssh/bigpanda
 
 Host ender
 User nimrod
 IdentityFile ~/.ssh/bigpanda
+
+Host github-bp
+HostName github.com
+User git
+IdentityFile ~/.ssh/bigpanda

.ssh/config.d/20_github

 # github.com
 
-Host github.com
-User git
-IdentityFile ~/.ssh/bigpanda
+#Host github.com
+#User git
+#IdentityFile ~/.ssh/id_rsa

.ssh/config.d/20_shore

@@ -19,7 +19,8 @@ ProxyCommand ssh ns1 nc %h %p
 Host ns2
 HostName ns2.shore.co.il
 User admin
-DynamicForward 8080
+DynamicForward 9999
+ProxyCommand ssh ns1 nc %h %p
 
 Host cgit
 HostName cgit.trusted