Some more updates to ssh_config.

.ssh/config.d/20_ec2

 # Disable SSH host key checking for EC2 instances.
+
 Host  *.compute-1.amazonaws.com
 UserKnownHostsFile /dev/null
 StrictHostKeyChecking no

.ssh/config.d/20_shore

 # shore.co.il infrastructure
 
-User nimrod
-IdentityFile shore_rsa
-
 Host ns1
 HostName ns1.shore.co.il
 LocalForward 9091 xbmc.trusted:9091
 DynamicForward 8080
+User nimrod
+IdentityFile ~/.ssh/shore_rsa
 
 Host xbmc
 HostName xbmc.trusted
@@ -17,13 +16,21 @@ ProxyCommand ssh ns1 nc %h %p
 Host web1
 HostName web1.trusted
 ProxyCommand ssh ns1 nc %h %p
+User nimrod
+IdentityFile ~/.ssh/shore_rsa
 
 Host ns2
 HostName ns2.shore.co.il
 User admin
 DynamicForward 9999
 ProxyCommand ssh ns1 nc %h %p
+IdentityFile ~/.ssh/shore_rsa
 
 Host cgit
 HostName cgit.trusted
 ProxyCommand ssh ns1 nc %h %p
+User nimrod
+IdentityFile ~/.ssh/shore_rsa
+
+HostName gitolite.Ansible.vagrant
+IdentityFile ~/.ssh/shore_rsa