add settings for pry

    - :Pry command to start pry
    - a mapping to toggle binding.pry for current line
    - a mapping to execute in VimShell
    - fix unite-n3337 mapping
Merge branch 'master' of github.com:rhysd/dotfiles

    remove conflicts for Ruby settings
Conflicts:
	vimrc