Merge branch 'master' of https://github.com/asmaps/dotfiles

Conflicts:
	init_server.sh
	ohmyzshrc

ohmyzshrc

@@ -4,6 +4,7 @@ export ZSH_TMUX_FIXTERM=false
 
 # Path to your oh-my-zsh installation.
 export ZSH=~/.oh-my-zsh
+export LC_ALL=en_US.UTF-8
 
 # Set name of the theme to load.
 # Look in ~/.oh-my-zsh/themes/
@@ -53,8 +54,9 @@ ZSH_THEME="gentoo"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git cp dirpersist tmux ssh-agent)
+plugins=(tmux dirpersist virtualenvwrapper ssh-agent extract node npm)
 
+zstyle ':completion:*' special-dirs true
 zstyle :omz:plugins:ssh-agent identities id_rsa
 
 # User configuration
@@ -88,3 +90,8 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
+
+alias mkvirtualenv3="mkvirtualenv -p `which python3`"
+alias dc="docker-compose"
+
+stty -ixon