diff --git a/.gitmodules b/.gitmodules
index 1aea66a..324fcb2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,3 @@
 [submodule "vim/vim/bundle/ctrlp.vim"]
 	path = vim/vim/bundle/ctrlp.vim
 	url = git://github.com/vim-scripts/ctrlp.vim.git
-[submodule "vim/vim/bundle/vimwiki"]
-	path = vim/vim/bundle/vimwiki
-	url = git://github.com/vim-scripts/vimwiki.git
diff --git a/vim/vimrc b/vim/vimrc
index da3a59b..80ce3a2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -133,3 +133,14 @@ let g:bufExplorerShowRelativePath=1
 set runtimepath^=~/.vim/bundle/ctrlp.vim
 let g:ctrlp_map = '<F3>'
 let g:ctrlp_cmd = 'CtrlP'
+
+py << EOF
+import os.path
+import sys
+import vim
+if 'VIRTUAL_ENV' in os.environ:
+    project_base_dir = os.environ['VIRTUAL_ENV']
+    sys.path.insert(0, project_base_dir)
+    activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
+    execfile(activate_this, dict(__file__=activate_this))
+EOF
diff --git a/zsh/zshrc b/zsh/zshrc
index e39da39..bbe0c5a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -35,7 +35,7 @@ source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
 export EDITOR='vi'
-export PATH=/usr/local/share/npm/bin:/usr/local/share/python:/usr/local/bin:$HOME/Applications/bin:$PATH
+export PATH=/usr/local/share/npm/bin:/usr/local/share/python:/usr/local/bin:/usr/local/sbin:$HOME/Applications/bin:$PATH
 export WORKON_HOME=$HOME/.virtualenvs
 export LC_CTYPE="en_US.UTF-8"