Merge remote-tracking branch 'refs/remotes/origin/master'

.zshrc

@@ -3,15 +3,20 @@
 zstyle ':completion:*' completer _complete _ignored
 zstyle :compinstall filename '~/.zshrc'
 
+# Completion
 autoload -Uz compinit
 compinit
 HISTFILE=~/.zsh_history
 HISTSIZE=5000000
 SAVEHIST=5000000
-setopt appendhistory beep nomatch notify autocd histignoredups
+setopt appendhistory beep nomatch notify autocd histignoredups correct autopushd pushdsilent pushdtohome pushdignoredups pushdminus
 
+# emacs keybindings
 bindkey -e
 
+# Prevent need to reset terminal
+ttyctl -f
+
 # Arrows in the Completition menu
 zstyle ':completion:*' menu select
 
@@ -38,4 +43,5 @@ precmd() {
 # Report CPU usage for commands running longer than 1 second
 REPORTTIME=1
 
-. ~/.profile
+# Dirstack
+DIRSTACKSIZE=20