diff --git a/bash_aliases b/bash_aliases
index 18f7211..7b1f6c9 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -50,7 +50,7 @@ doPsKill(){
 }
 alias pskill=doPsKill
 
-alias docker-nuke="docker rm -f $(docker ps -a -q) && docker rmi $(docker images -q)"
+alias docker-nuke="docker rm $(docker ps -a -q) && docker rmi $(docker images -q)"
 alias dc='docker-compose'
 alias docker-rm-untagged='docker rmi -f $(docker images | grep "^<none>" | awk "{print $3}")'}
 
diff --git a/bash_functions b/bash_functions
index 01208f4..dd8c7a4 100644
--- a/bash_functions
+++ b/bash_functions
@@ -35,10 +35,3 @@ cb() {
 
 function gi() { curl -L -s https://www.gitignore.io/api/\$@ ;}
 
-function installCode(){
-  cd /tmp
-  sudo rm -rfv /opt/VSCode-linux-x64
-  sudo unzip /tmp/VSCode-linux-x64-stable.zip -d /opt/
-  sudo chown fergalm:fergalm /opt/VSCode-linux-x64 -R
-  sudo chown fergalm:fergalm /opt/VSCode-linux-x64 
-}
diff --git a/bashrc b/bashrc
index 49496db..59c59d1 100644
--- a/bashrc
+++ b/bashrc
@@ -95,6 +95,9 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
+#use known hosts for bash autocomplete - this needs "HashKnown Hosts no" in ~/.ssh/config
+complete -W "$(echo `cat ~/.ssh/known_hosts | cut -f 1 -d ' ' | sed -e s/,.*//g | uniq | grep -v "\["`;)" ssh
+
 
 # Include functions file
 if [ -f ~/.bash_functions ]; then
@@ -120,3 +123,12 @@ shopt -s histappend                      # append to history, don't overwrite it
 
 # Save and reload the history after each command finishes
 export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
+
+VIRTUALENVWRAPPER=/usr/local/bin/virtualenvwrapper.sh
+if [ -f $VIRTUALENVWRAPPER ];
+then
+    export WORKON_HOME=$HOME/.virtualenvs
+    export PROJECT_HOME=$HOME/dev/personal
+    source /usr/local/bin/virtualenvwrapper.sh
+fi
+
diff --git a/install.sh b/install.sh
index 15eff14..d84543a 100755
--- a/install.sh
+++ b/install.sh
@@ -6,7 +6,7 @@ h
 
 dir=~/dotfiles                    # dotfiles directory
 olddir=~/dotfiles_old             # old dotfiles backup directory
-files="bashrc bash_aliases bash_profile bash_prompt bash_functions sqliterc"    # list of files/folders to symlink in homedir
+files="zshrc bashrc bash_aliases bash_profile bash_prompt bash_functions sqliterc"    # list of files/folders to symlink in homedir
 
 ##########
 
diff --git a/zshrc b/zshrc
new file mode 100644
index 0000000..1ba5861
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,85 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+  export ZSH=/home/fergalm/.oh-my-zsh
+
+# Set name of the theme to load. Optionally, if you set this to "random"
+# it'll load a random theme each time that oh-my-zsh is loaded.
+# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+ZSH_THEME="agnoster"
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion. Case
+# sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# 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)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# ssh
+# export SSH_KEY_PATH="~/.ssh/rsa_id"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"