Add diffconflicts binary (Vimdiff wrapper)

Got this from this excellent tutorial:
http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool
Git, Vim: Use diffconflicts as mergetool

From the tutorial:
    http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool
Revert "bashrc: Look for ndenv"

This reverts commit 12b9fb34b9f93e4c0f82719089fc3f97eb88bf34.
bashrc: Point 'npm install -g' to $HOME
npmrc: Install packages globally in $HOME
Vim: Change binding for inserting Perl breakpoints
Vim: Also be able to insert Node.js breakpoints