diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
index cfd3b2d..0ee36b2 160000
--- a/vim/.vim/bundle/Vundle.vim
+++ b/vim/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933
+Subproject commit 0ee36b26e127cda512a8f2852a59e5a5f374c87f
diff --git a/vim/.vim/bundle/ctrlp.vim b/vim/.vim/bundle/ctrlp.vim
new file mode 160000
index 0000000..b5d3fe6
--- /dev/null
+++ b/vim/.vim/bundle/ctrlp.vim
@@ -0,0 +1 @@
+Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
index 78566c3..8c30610 160000
--- a/vim/.vim/bundle/vim-airline
+++ b/vim/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit 78566c37aeb3b7609eee84a7b10114a0f512830e
+Subproject commit 8c30610c5f60eada1d21ab23e96d45848a1e6e58
diff --git a/vim/.vim/bundle/vim-expand-region b/vim/.vim/bundle/vim-expand-region
new file mode 160000
index 0000000..9665135
--- /dev/null
+++ b/vim/.vim/bundle/vim-expand-region
@@ -0,0 +1 @@
+Subproject commit 966513543de0ddc2d673b5528a056269e7917276
diff --git a/vim/.vim/bundle/vim-gitgutter b/vim/.vim/bundle/vim-gitgutter
new file mode 160000
index 0000000..bcb601a
--- /dev/null
+++ b/vim/.vim/bundle/vim-gitgutter
@@ -0,0 +1 @@
+Subproject commit bcb601acd2b0b6376cb6a1ca623414663f643306
diff --git a/vim/.vim/init.vim b/vim/.vim/init.vim
new file mode 120000
index 0000000..4de1182
--- /dev/null
+++ b/vim/.vim/init.vim
@@ -0,0 +1 @@
+/home/alex/.vimrc
\ No newline at end of file
diff --git a/vim/.vim/shada/main.shada b/vim/.vim/shada/main.shada
new file mode 100644
index 0000000..453efdb
Binary files /dev/null and b/vim/.vim/shada/main.shada differ
diff --git a/vim/.vimrc b/vim/.vimrc
index 45064f9..57fae3e 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,5 +1,5 @@
-set nocompatible              " be iMproved, required
-filetype off      		           " required
+set nocompatible
+filetype off
 
 set autoread
 
@@ -10,40 +10,29 @@ set ruler
 
 syntax enable
 
-" set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
-" alternatively, pass a path where Vundle should install plugins
-"call vundle#begin('~/some/path/here')
 
-" let Vundle manage Vundle, required
 Plugin 'gmarik/Vundle.vim'
 Plugin 'bling/vim-airline'
 Plugin 'whatyouhide/vim-gotham'
 Plugin 'scrooloose/nerdtree'
 Plugin 'Xuyuanp/nerdtree-git-plugin'
-Plugin 'suan/vim-instant-markdown'
-" All of your Plugins must be added before the following line
-call vundle#end()            " required
-filetype plugin indent on    " required
-" To ignore plugin indent changes, instead use:
-"filetype plugin on
-"
-" Brief help
-" :PluginList       - lists configured plugins
-" :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
-" :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
-"
-" see :h vundle for more details or wiki for FAQ
-" Put your non-Plugin stuff after this line
+Plugin 'terryma/vim-expand-region'
+Plugin 'kien/ctrlp.vim'
+Plugin 'airblade/vim-gitgutter'
+
+call vundle#end()
+filetype plugin indent on
 
 colorscheme gotham
 
 set laststatus=2
-let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 
+let g:airline_left_sep = ""
+let g:airline_right_sep = ""
+
 set hidden
 
 let g:NERDTreeIndicatorMapCustom = {
@@ -58,9 +47,38 @@ let g:NERDTreeIndicatorMapCustom = {
     \ "Unknown"   : "?"
     \ }
 
-autocmd vimenter * NERDTree
-autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 map <C-n> :NERDTreeToggle<CR>
 let NERDTreeShowHidden=1
+
+vmap v <Plug>(expand_region_expand)
+vmap <C-v> <Plug>(expand_region_shrink)
+
+let g:ctrlp_show_hidden = 1
+
+function! ClipboardYank()
+	  call system('xclip -i -selection clipboard', @@)
+endfunction
+function! ClipboardPaste()
+	  let @@ = system('xclip -o -selection clipboard')
+endfunction
+
+vnoremap <silent> y y:call ClipboardYank()<cr>
+vnoremap <silent> d d:call ClipboardYank()<cr>
+nnoremap <silent> p :call ClipboardPaste()<cr>p
+
+tnoremap <Esc> <C-\><C-n>
+tnoremap <A-h> <C-\><C-n><C-w>h
+tnoremap <A-j> <C-\><C-n><C-w>j
+tnoremap <A-k> <C-\><C-n><C-w>k
+tnoremap <A-l> <C-\><C-n><C-w>l
+nnoremap <A-h> <C-w>h
+nnoremap <A-j> <C-w>j
+nnoremap <A-k> <C-w>k
+nnoremap <A-l> <C-w>l
+
+map <A-CR> :terminal<CR>
+
+nnoremap <A-,> <C-w><
+nnoremap <A-.> <C-w>>
+nnoremap <A--> <C-w>-
+nnoremap <A-=> <C-w>+