trying to fix wikipedia issues
merge of tonights work: wiki stuff and adding icanhaz