Merge branch 'master' of github.banksimple.com:will/dotfiles
Buncha stuff from weechat.