Merge remote-tracking branch 'origin/master' into dev

AUTHORS.txt

@@ -41,6 +41,7 @@ nagev (@np1)
 Chris Lasher (@gotgenes) <chris.lasher@gmail.com>
 Doan Thanh Nam (@tndoan)
 Markus Koller (@toupeira)
+Justin Cheevers @justincheevers
 
 
 @something are github user names.

README.rst

@@ -67,12 +67,20 @@ Installation
 You might want to use `pathogen <https://github.com/tpope/vim-pathogen>`_ or
 `vundle <https://github.com/gmarik/vundle>`_ to install jedi in VIM. Also you
 need a VIM version that was compiled with ``+python``, which is typical for most
-distributions on Linux.
+distributions on Linux.  The Python version compiled into VIM must be 2.6 or later
+(you can check this from within VIM using ``:python import sys; print sys.version`` )
 
 The first thing you need after that is an up-to-date version of Jedi. You can
 either get it via ``pip install jedi`` or with ``git submodule update --init``
 in your jedi-vim repository.
 
+Example Installation Command using Pathogen:
+
+.. code-block:: sh
+
+    cd ~/.vim/bundle/ && git clone --recursive https://github.com/davidhalter/jedi-vim.git
+
+
 On Arch Linux, you can also install jedi-vim from AUR: `vim-jedi
 <https://aur.archlinux.org/packages/vim-jedi/>`__.
 

autoload/jedi.vim

@@ -94,7 +94,7 @@ function! jedi#add_goto_window()
     execute 'belowright copen '.g:jedi#quickfix_window_height
     set nolazyredraw
     if g:jedi#use_tabs_not_buffers == 1
-        map <buffer> <CR> :call jedi#goto_window_on_enter()<CR>
+        noremap <buffer> <CR> :call jedi#goto_window_on_enter()<CR>
     endif
     au WinLeave <buffer> q  " automatically leave, if an option is chosen
     redraw!