Yet more changes changes changes wat

zshrc

@@ -37,8 +37,15 @@ plugins=(
     rbenv
 )
 
+fpath=(/usr/local/share/zsh/site-functions $fpath)
+
 source $ZSH/oh-my-zsh.sh
 
+# The completion for aws is not compatible with $fpath :scream_cat:
+if [[ -f /usr/local/share/zsh/site-functions/_aws ]] ; then
+  source /usr/local/share/zsh/site-functions/_aws
+fi
+
 unsetopt correct_all
 bindkey '^R' history-incremental-search-backward
 
@@ -66,6 +73,8 @@ for prefix in github.com code.google.com/p ; do
   CDPATH="$HOME/gopath/src/$prefix:$CDPATH"
 done
 
+export GPG_TTY=$(tty)
+
 source ~/.bash_aliases
 
 function dump-ssh-agent() {