diff --git a/.vim/syntax/clang-format.py b/.vim/syntax/clang-format.py
new file mode 120000
index 0000000..a10447f
--- /dev/null
+++ b/.vim/syntax/clang-format.py
@@ -0,0 +1 @@
+/usr/share/vim/addons/syntax/clang-format-3.5.py
\ No newline at end of file
diff --git a/.vimrc b/.vimrc
index 7411e4a..058812a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -166,6 +166,10 @@ else
 	" indent-expr
 	"set indentexpr ""
 endif
+
+map <C-I> :pyf ~/.vim/syntax/clang-format.py<CR>
+imap <C-I> <ESC>:pyf ~/.vim/syntax/clang-format.py<CR>i
+
 """"""""""
 " SEARCH "
 """"""""""
@@ -450,7 +454,7 @@ Plugin 'honza/vim-snippets'
 Plugin 'garbas/vim-snipmate'
 
 " Python completion
-Plugin 'klen/python-mode'
+"Plugin 'klen/python-mode'
 "" Python Bundle
 "Plugin  'davidhalter/jedi-vim'
 "Plugin  'scrooloose/syntastic'