Merge branch 'master' of github.com:ivanov/vim-ipython

Author: ivanov

ftplugin/python/ipy.vim

@@ -446,7 +446,6 @@ if g:ipy_perform_mappings != 0
     map <silent> <M-s> :python dedent_run_this_line()<CR>
     vmap <silent> <C-S> :python run_these_lines()<CR>
     vmap <silent> <M-s> :python dedent_run_these_lines()<CR>
-    map <silent> <C-p> :python set_this_line()<CR>
     map <silent> <M-c> I#<ESC>
     vmap <silent> <M-c> I#<ESC>
     map <silent> <M-C> :s/^\([ \t]*\)#/\1/<CR>