Merge conflicts.
Merge branch 'master' of https://github.com/RockyCal/CINERGIWebCrawler

Conflicts:
	crawler_base.py
Merge branch 'master' of https://github.com/RockyCal/CINERGIWebCrawler
Merge branch 'master' of https://github.com/RockyCal/CINERGIWebCrawler
Working recursive version, for two runs. Needs to be tested on more than two.