diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index e4a9481..7b23dba 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -1,11 +1,17 @@
-ControlMaster auto 
+ControlMaster auto
 ControlPath ~/.ssh/%h:%p_%r
 ServerAliveInterval 60
 ForwardAgent yes
 NoHostAuthenticationForLocalhost yes
 HashKnownHosts no
 IdentityFile ~/.ssh/id_ed25519
-#IdentitiesOnly no
+#IdentitiesOnly yes
 
+Host *amazonaws.com
+        StrictHostKeyChecking no
+        UserKnownHostsFile /dev/null
+
+Include local-config
 Include scalene-config
 Include infinite-config
+
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 092f934..b481d76 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -2,6 +2,7 @@ alias ls='ls --color=auto'
 alias mailx='/usr/local/bin/mailx'
 alias grep='grep --color'
 alias vim='nvim'
+alias vi='nvim'
 
 bindkey -v
 
@@ -45,14 +46,14 @@ if [[ $#h -gt 0 ]]; then
   zstyle ':completion:*:(ssh|scp|slogin|sftp):*' hosts $h
 fi
 
-zstyle :compinstall filename '/home/jswank/.zshrc'
+zstyle :compinstall filename '~/.zshrc'
 autoload -Uz compinit
 compinit
 
 # The following lines were added by compinstall
 
 #zstyle ':completion:*' completer _complete _ignored
-#zstyle :compinstall filename '/home/jswank/.zshrc'
+#zstyle :compinstall filename '~/.zshrc'
 #
 #autoload -Uz compinit
 #compinit