Merge wookipedia feed with Adam's changes