Big clean-up, added dependencies on NetworkX, split out interface to wikipedia.