diff --git a/.bashrc b/.bashrc
index f786884ce2c2909b87871efecbe6a1c7f8ae7a06..4b1b3fe830e1398c84ddadca351d0752ab551e49 100644
--- a/.bashrc
+++ b/.bashrc
@@ -58,3 +58,4 @@ alias sf='php app/console --ansi'
 export TERM=screen-256color
 export PATH="$PATH:$HOME/.composer/vendor/bin"
 export PATH="$PATH:$HOME/.gem/ruby/2.1.0/bin"
+
diff --git a/.vimrc b/.vimrc
index 9282bdb204847e335615143c8a2ae5aa8a4eb7fa..8593ce2464685ef6506b9026516858f278805542 100644
--- a/.vimrc
+++ b/.vimrc
@@ -15,13 +15,15 @@ Plugin 'kien/ctrlp.vim.git'
 Plugin 'arnaud-lb/vim-php-namespace.git'
 Plugin 'Lokaltog/vim-powerline.git'
 Plugin 'tpope/vim-fugitive.git'
-
+Plugin 'airblade/vim-gitgutter'
 
 " Here should be other plugins
 " Bundle 'joonty/vim-phpqa.git'
 
-Bundle 'tobyS/pdv'
 Bundle 'danro/rename.vim'
+Bundle 'tobyS/vmustache'
+Bundle 'SirVer/ultisnips'
+Bundle 'tobyS/pdv'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -140,5 +142,13 @@ endfunc
 " Mapping of the last function on CTRL+N
 nnoremap <C-n> :call NumberToggle()<cr>
 
+" Config to set phpdocblock on CTRL+M
+nmap <Leader>d :call pdv#DocumentWithSnip()<CR>
+let g:pdv_template_dir = $HOME ."/.vim/bundle/pdv/templates_snip"
 
+nmap <S-j> <C-y><CR>
 
+" Git Gutter
+" let g:gitgutter_avoid_cmd_prompt_on_windows = 0
+let g:gitgutter_sign_column_always = 1
+let g:gitgutter_realtime = 1