Merge muttrc updates