diff --git a/AUTHORS.txt b/AUTHORS.txt
index 18e97b0..83c4802 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -36,6 +36,9 @@ Sheng Yun (@ShengYun) <uewing@gmail.com>
 Yann Thomas-Gérard (@inside) <inside@gmail.com>
 Colin Su (@littleq0903) <littleq0903@gmail.com>
 Arthur Jaron (@eyetracker)
+Justin M. Keyes (@justinmk)
+nagev (@np1)
+Chris Lasher (@gotgenes) <chris.lasher@gmail.com>
 
 
 @something are github user names.
diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index c052ed1..c23fac1 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -217,7 +217,6 @@ endfunction
 " ------------------------------------------------------------------------
 " deprecations
 " ------------------------------------------------------------------------
-
 let s:deprecations = {
     \ 'get_definition_command':     'goto_definitions_command',
     \ 'goto_command':               'goto_assignments_command',
@@ -261,7 +260,6 @@ function! s:init()
       end
   endfor
 
-
   for [key, val] in items(s:settings)
       if !exists('g:jedi#'.key)
           exe 'let g:jedi#'.key.' = '.val
diff --git a/doc/jedi-vim.txt b/doc/jedi-vim.txt
index ee69544..66ae421 100644
--- a/doc/jedi-vim.txt
+++ b/doc/jedi-vim.txt
@@ -19,10 +19,10 @@ Contents				*jedi-vim-contents*
     2.3. Using Vundle			|jedi-vim-installation-vundle|
 3. Supported Python features		|jedi-vim-support|
 4. Usage				|jedi-vim-usage|
-5. Mappings				|jedi-vim-mappings|
+5. Mappings				|jedi-vim-keybindings|
     5.1. Start completion		|g:jedi#completions_command|
     5.2. Go to assignment		|g:jedi#goto_assignments_command|
-    5.3. Get original definition	|g:jedi#get_definitions_command|
+    5.3. Get original definition	|g:jedi#goto_definitions_command|
     5.4. Show documentation		|g:jedi#documentation_command|
     5.5. Rename variables		|g:jedi#rename_command|
     5.6. Show name usages		|g:jedi#usages_command|
@@ -225,7 +225,7 @@ the cursor. Just like the `jedi#goto_assignments()` function, it does not work
 if the definition isn't in a Python source file.
 
 The difference between `jedi#goto_assignments()` and `jedi#goto_definitions()`
-is that the former doesn't perform recursive lookups. Take, for example, the
+is that the latter performs recursive lookups. Take, for example, the
 following module structure: >
 
     # file1.py:
@@ -238,9 +238,16 @@ following module structure: >
     def bar():
         pass
 
-The `jedi#goto_definitions()` function will take you to the "from file2 import foo"
+The `jedi#goto_assignments()` function will take you to the >
+
+    from file2 import foo
+
 statement in file1.py, while the `jedi#goto_definitions()` function will take
-you all the way to the "def bar():" line in file3.py.
+you all the way to the >
+
+    def bar():
+
+line in file3.py.
 
 ------------------------------------------------------------------------------
 5.4. `g:jedi#documentation_command`	*g:jedi#documentation_command*
@@ -291,7 +298,7 @@ Upon initialization, jedi-vim performs the following steps:
 
 1. Set the current buffers 'omnifunc' to its own completion function
    `jedi#complete`
-2. Create mappings to commands specified in |jedi-vim-mappings|
+2. Create mappings to commands specified in |jedi-vim-keybindings|
 3. Call `jedi#configure_call_signatures()` if
    `g:jedi#show_call_signatures` is set
 
diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index f1a69d6..938b10c 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -8,17 +8,17 @@ endif
 if g:jedi#auto_initialization
     " goto / get_definition / usages
     if g:jedi#goto_assignments_command != ''
-        execute "noremap <buffer>".g:jedi#goto_assignments_command." :call jedi#goto_assignments()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#goto_assignments_command." :call jedi#goto_assignments()<CR>"
     endif
     if g:jedi#goto_definitions_command != ''
-        execute "noremap <buffer>".g:jedi#goto_definitions_command." :call jedi#goto_definitions()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#goto_definitions_command." :call jedi#goto_definitions()<CR>"
     endif
     if g:jedi#usages_command != ''
-        execute "noremap <buffer>".g:jedi#usages_command." :call jedi#usages()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#usages_command." :call jedi#usages()<CR>"
     endif
     " rename
     if g:jedi#rename_command != ''
-        execute "noremap <buffer>".g:jedi#rename_command." :call jedi#rename()<CR>"
+        execute "nnoremap <buffer> ".g:jedi#rename_command." :call jedi#rename()<CR>"
     endif
     " documentation/pydoc
     if g:jedi#documentation_command != ''
@@ -29,7 +29,9 @@ if g:jedi#auto_initialization
         call jedi#configure_call_signatures()
     endif
 
-    inoremap <silent> <buffer> . .<C-R>=jedi#complete_string(1)<CR>
+    if g:jedi#completions_enabled == 1
+        inoremap <silent> <buffer> . .<C-R>=jedi#complete_string(1)<CR>
+    endif
 
     if g:jedi#auto_close_doc
         " close preview if its still open after insert