Add pairs for Org mode
Remove upstreamed code

Recent Emacs 24.4 knows about `addbibresource`