Switched from ssh-agent to keychain. Removed some prettiness that was slowing down zsh.
Merge remote-tracking branch 'origin/master'