diff --git a/install.sh b/install.sh
index 28aa3c1..eb613f7 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-packages="sshpass tmux python3-pip cargo"
-pip="awscli"
+packages="sshpass tmux python3-pip cargo vim-nox build-essential python3-dev"
+pip="awscli cmake"
 
 read -p "Are you sure? (Y/N) "
 
@@ -76,10 +76,19 @@ fi
 if [[ -d ~/.dotfiles/vim ]]
 then
 	echo "Installing vim configuration ..."
-	rm -rf ~/.vim*
+	rm -rf ~/.vimrc
 	mkdir -p ~/.vim/bundle
-	git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-	cp ~/.dotfiles/vim/vimrc ~/.vimrc
+	if [[ ! -d ~/.vim/bundle/Vundle.vim ]]
+	then
+		git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+	fi
+	ln -sf ~/.dotfiles/vim/vimrc ~/.vimrc
+fi
+
+if [[ -d ~/.vim/bundle/YouCompleteMe ]]
+then
+	echo "Installing ycm dependencies"
+	python3 ~/.vim/bundle/YouCompleteMe/install.py --all
 fi
 
 . ~/.bashrc
diff --git a/ssh/.gitignore b/ssh/.gitignore
new file mode 100644
index 0000000..2906d75
--- /dev/null
+++ b/ssh/.gitignore
@@ -0,0 +1 @@
+known_hosts*
diff --git a/ssh/hubbuilder.pem b/ssh/hubbuilder.pem
new file mode 100644
index 0000000..3c5df55
--- /dev/null
+++ b/ssh/hubbuilder.pem
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtz
+c2gtZWQyNTUxOQAAACBguwMJZpgiItrEkX1uTPUMLl2ZYJ29eLE29/BSiU/KMwAA
+AIgaAHS9GgB0vQAAAAtzc2gtZWQyNTUxOQAAACBguwMJZpgiItrEkX1uTPUMLl2Z
+YJ29eLE29/BSiU/KMwAAAEAwUQIBATAFBgMrZXAEIgQgRBFe0FmY6SMtelz5cM/J
+4GC7AwlmmCIi2sSRfW5M9QwuXZlgnb14sTb38FKJT8ozAAAAAAECAwQF
+-----END OPENSSH PRIVATE KEY-----
diff --git a/vim/vimrc b/vim/vimrc
index 05cb837..02d0010 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -10,6 +10,15 @@ call vundle#begin()
 
 " let Vundle manage Vundle, required
 Plugin 'gmarik/Vundle.vim'
+Plugin 'tmhedberg/SimpylFold'
+Plugin 'vim-scripts/indentpython.vim'
+Plugin 'Valloric/YouCompleteMe'
+Plugin 'vim-syntastic/syntastic'
+Plugin 'nvie/vim-flake8'
+Plugin 'jnurmine/Zenburn'
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'kien/ctrlp.vim'
+Plugin 'tpope/vim-fugitive'
 
 " add all your plugins here (note older versions of Vundle
 " used Bundle instead of Plugin)
@@ -19,3 +28,72 @@ Plugin 'gmarik/Vundle.vim'
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
+
+" Split zones
+set splitbelow
+set splitright
+
+"split navigations
+nnoremap <C-J> <C-W><C-J>
+nnoremap <C-K> <C-W><C-K>
+nnoremap <C-L> <C-W><C-L>
+nnoremap <C-H> <C-W><C-H>
+
+" Enable folding
+set foldmethod=indent
+set foldlevel=99
+
+" Enable folding with the spacebar
+nnoremap <space> za
+
+" See the docstrings when folded
+let g:SimpylFold_docstring_preview=1
+
+" PEP8 indentation
+au BufNewFile,BufRead *.py
+    \ set tabstop=4
+    \ set softtabstop=4
+    \ set shiftwidth=4
+    \ set textwidth=79
+    \ set expandtab
+    \ set autoindent
+    \ set fileformat=unix
+
+" Flag whitespaces
+au BufRead,BufNewFile *.py,*.c,*.h match BadWhitespace /\s\+$/
+
+" UTF-8 support
+set encoding=utf-8
+
+" YCM customizations
+let g:ycm_autoclose_preview_window_after_completion=1
+map <leader>g  :YcmCompleter GoToDefinitionElseDeclaration<CR>
+
+" virtualenv support for YCM
+" py << EOF
+" import os
+" import sys
+" if 'VIRTUAL_ENV' in os.environ:
+"	project_base_dir = os.environ['VIRTUAL_ENV']
+"	activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
+"	execfile(activate_this, dict(__file__=activate_this))
+"EOF
+"
+
+" Python syntax highlighting
+let python_highlight_all=1
+syntax on
+
+" Color themes
+if has('gui_running')
+  set background=dark
+  colorscheme solarized
+else
+  colorscheme zenburn
+endif
+
+" Toggle between dark and light theme
+call togglebg#map("<F5>")
+
+" Line numbers
+set nu