merge in from Joost, some other changes
Fixed ugly org-mode face.
removed references to w3m