diff --git a/.gitignore b/.gitignore
index b948985..bf212ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
-*.swp
-*.pyc
+*~
+*.sw?
+*.py[cod]
+.coverage
+.tox
+.mr.developer.cfg
+.project
+.pydevproject
+.ropeproject
+.idea
diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index aa37298..997a4cd 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -101,7 +101,7 @@ function! jedi#new_buffer(path)
     set filetype=python
 endfunction
 
-function! s:add_goto_window()
+function! jedi#add_goto_window()
     set lazyredraw
     cclose
     execute 'belowright copen 3'
@@ -120,7 +120,7 @@ function! jedi#goto_window_on_enter()
     if l:data.bufnr
         " close goto_window buffer
         normal ZQ
-        jedi#new_buffer(bufname(l:data.bufnr))
+        call jedi#new_buffer(bufname(l:data.bufnr))
         call cursor(l:data.lnum, l:data.col)
     else
         echohl WarningMsg | echo "Builtin module cannot be opened." | echohl None
diff --git a/plugin/jedi_vim.py b/plugin/jedi_vim.py
index 1402d0b..0610e1d 100644
--- a/plugin/jedi_vim.py
+++ b/plugin/jedi_vim.py
@@ -148,7 +148,7 @@ def goto(is_definition=False, is_related_name=False, no_output=False):
                                     lnum=d.line_nr, col=d.column + 1,
                                     text=PythonToVimStr(d.description)))
             vim.eval('setqflist(%s)' % repr(lst))
-            vim.eval('<sid>add_goto_window()')
+            vim.eval('jedi#add_goto_window()')
     return definitions