diff --git a/gitconfig b/gitconfig
index 4deae61..b7e990e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,5 +5,8 @@
   default = simple
 [core]
   excludesfile = /Users/michi/.gitignore
+  editor = macvim
 [branch]
   autosetuprebase = always
+[color]
+  ui = auto
diff --git a/vimrc b/vimrc
index ebe60f9..442630c 100644
--- a/vimrc
+++ b/vimrc
@@ -17,18 +17,24 @@ Plugin 'gmarik/Vundle.vim'
 
 " my plugins
 Plugin 'bling/vim-airline'
+Plugin 'danro/rename.vim'
 Plugin 'elixir-lang/vim-elixir'
 Plugin 'ervandew/supertab'
+Plugin 'garbas/vim-snipmate'
 Plugin 'ingydotnet/yaml-vim'
+Plugin 'jiangmiao/auto-pairs'
 Plugin 'kchmck/vim-coffee-script'
 Plugin 'kien/ctrlp.vim'
+Plugin 'MarcWeber/vim-addon-mw-utils'
 Plugin 'mileszs/ack.vim'
 Plugin 'mustache/vim-mustache-handlebars'
 Plugin 'pangloss/vim-javascript'
 Plugin 'Raimondi/delimitMate'
 Plugin 'scrooloose/nerdcommenter'
 Plugin 'scrooloose/nerdtree'
+Plugin 'scrooloose/syntastic'
 Plugin 'sjl/gundo.vim'
+Plugin 'tomtom/tlib_vim'
 Plugin 'tpope/vim-cucumber'
 Plugin 'tpope/vim-endwise'
 Plugin 'tpope/vim-fugitive'
@@ -37,6 +43,7 @@ Plugin 'tpope/vim-rails'
 Plugin 'tpope/vim-surround'
 Plugin 'vimwiki/vimwiki'
 Plugin 'vim-ruby/vim-ruby'
+Plugin 'vim-scripts/tComment'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required