add vimdiff-r back from old ~/bin
ensure that .bash_history is ignored
add updated weechat conf
Merge branch 'master' of github.com:moquist/dotfiles.pub