Merge branch 'master' of tardis:dotfiles

diff --combined vim/vimrc
index 14ebec3c88ced741c33610555cc35bf75507eb83,e1e5a291ae2b8c0c9980d98e5892454f221f7d38..810f2f58f686c199a8ccd84bd7aeb3aaf4ba2783
--- 1/vim/vimrc
--- 2/vim/vimrc
+++ b/vim/vimrc
@@@ -438,6 -438,7 +438,7 @@@ autocmd bufenter * if (winnr("$") == 1 
  " python-mode {{{2
  
  let g:pymode_rope_completion = 0
+ let g:pymode_rope = 0
  let g:pymode_folding = 1
  
  " synastic {{{2
@@@ -531,3 -532,19 +532,3 @@@ nnoremap <silent> <Leader>s :call Toggl
  nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
  " fix spelling with first choice
  nnoremap <Leader>f 1z=
 -
 -" Toggle line numbers {{{2
 -function! g:ToggleNumber()
 -    if !exists("b:relanum")
 -        let b:relanum=1
 -    endif
 -    if &l:number
 -        let b:relanum = &relativenumber
 -        setlocal nonumber norelativenumber
 -    else
 -        let &l:relativenumber = b:relanum
 -        setlocal number
 -    endif
 -endfunction
 -nnoremap <silent><leader>n :call g:ToggleNumber()<cr>
 -nnoremap <silent><leader>N :setlocal relativenumber!<cr>