Merge conflicts.
Merge branch 'master' of https://github.com/RockyCal/CINERGIWebCrawler
Now functional threading, recursive function, and term definition pointers.

Conflicts:
	crawler_base.py