merge conflict

configs/vimrc

@@ -32,6 +32,7 @@ endif
 "  Those are my settings
 " ----------------------------------------------------------------------
 
+set nocompatible		" force no compatibility with standard "vi"
 set tabstop=4			" tabs are displayed as 4 spaces
 set shiftwidth=4		" by default, when auto-identing, add 4 spaces (or 1 tabstop)
 set foldmethod=marker	" fold on markers
@@ -54,12 +55,80 @@ set number				" show line numbers
 set wim=longest,list	" file auto-completion
 set background=dark		" to follow most of the colorschemes I use
 set vb t_vb=            " convert bells to visual bells and do nothing as visual bell
-
 set t_Co=256			" 256 color terminals
 
+let mapleader=","     " use comma to start user-defined (in plugins) functions
+
 syntax sync minlines=1500	" increases the number of lines to find the proper syntax
 
-let mapleader=","     " use comma to start user-defined (in plugins) functions
+" ----------------------------------------------------------------------
+"  Vundle stuff starts here
+" ----------------------------------------------------------------------
+filetype off
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+" ----------------------------------------------------------------------
+"  Bundles
+" ----------------------------------------------------------------------
+" Vundle itself!
+Plugin 'gmarik/vundle'
+
+" status line
+Plugin 'bling/vim-airline'
+
+" git support
+Plugin 'tpope/vim-fugitive'
+
+" comment code with keys
+Plugin 'tpope/vim-commentary'
+
+" align things
+Plugin 'godlygeek/tabular'
+
+" close pairs
+Plugin 'jiangmiao/auto-pairs'
+
+" python 
+" Plugin 'klen/python-mode'
+Plugin 'scrooloose/syntastic'
+" Plugin 'hdima/python-syntax'
+Plugin 'hynek/vim-python-pep8-indent'
+Plugin 'davidhalter/jedi-vim'
+
+" Javascript
+Plugin 'pangloss/vim-javascript'
+
+" snippets
+Plugin 'msanders/snipmate.vim'
+
+" fuzzy file open
+Plugin 'kien/ctrlp.vim'
+
+" fuzzy function search (based on ctrlp)
+Plugin 'tacahiroy/ctrlp-funky' 
+
+" select multiple strings at the same time
+Plugin 'terryma/vim-multiple-cursors'
+
+" colorscheme
+Plugin 'croaker/mustang-vim'
+Plugin 'Ambient-Color-Scheme'
+Plugin 'EditPlus'
+Plugin 'altercation/vim-colors-solarized'
+Plugin 'w0ng/vim-hybrid'
+
+" Improved syntax files
+Plugin 'Glench/Vim-Jinja2-Syntax'
+Plugin 'fmoralesc/vim-pinpoint'
+Plugin 'elzr/vim-json'
+
+" Airline to prompt
+Plugin 'edkolev/promptline.vim'
+
+call vundle#end()            " done with plugins
+
+color mustang			" looks awesome on gvim, looks alright in vim if you have 256 color support
 
 " Enable file type detection.
 " Use the default filetype settings, so that mail gets 'tw' set to 72,
@@ -173,66 +242,6 @@ else
 	imap <M-0> <ESC>:tabn 10<CR>a
 endif
 
-" Vundle stuff starts here
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
-
-" ----------------------------------------------------------------------
-"  Bundles
-" ----------------------------------------------------------------------
-" Vundle itself!
-Bundle 'gmarik/vundle'
-
-" status line
-Bundle "bling/vim-airline"
-
-" git support
-Bundle 'tpope/vim-fugitive'
-
-" comment code with keys
-Bundle 'tpope/vim-commentary'
-
-" align things
-Bundle 'godlygeek/tabular'
-
-" close pairs
-Bundle 'jiangmiao/auto-pairs'
-
-" python 
-" Bundle 'klen/python-mode'
-Bundle 'scrooloose/syntastic'
-" Bundle 'hdima/python-syntax'
-Bundle 'hynek/vim-python-pep8-indent'
-Bundle 'davidhalter/jedi-vim'
-
-" snippets
-Bundle 'msanders/snipmate.vim'
-
-" fuzzy file open
-Bundle 'kien/ctrlp.vim'
-
-" fuzzy function search (based on ctrlp)
-Bundle 'tacahiroy/ctrlp-funky' 
-
-" select multiple strings at the same time
-Bundle 'terryma/vim-multiple-cursors'
-
-" colorscheme
-Bundle 'croaker/mustang-vim'
-Bundle "Ambient-Color-Scheme"
-Bundle 'EditPlus'
-Bundle 'altercation/vim-colors-solarized'
-Bundle 'w0ng/vim-hybrid'
-color mustang			" looks awesome on gvim, looks alright in vim if you have 256 color support
-
-" Improved syntax files
-Bundle 'Glench/Vim-Jinja2-Syntax'
-Bundle 'fmoralesc/vim-pinpoint'
-Bundle 'elzr/vim-json'
-
-" Airline to prompt
-Bundle 'edkolev/promptline.vim'
-
 " ----------------------------------------------------------------------
 " Autopair settings
 " ----------------------------------------------------------------------
@@ -276,3 +285,9 @@ autocmd Filetype json set noet ts=4
 " ----------------------------------------------------------------------
 au BufNewFile,BufRead *.pin set filetype=pinpoint
 au FileType pinpoint setlocal colorcolumn=79 textwidth=78
+
+" ----------------------------------------------------------------------
+"  Jedi-VIM
+" ----------------------------------------------------------------------
+" this disables the documentation/preview split
+autocmd FileType python setlocal completeopt-=preview