preparing to redo ingestion script
preparing to redo ingestion script
Merge branch 'master' of https://github.com/mattkiefer/cooktax

Conflicts:
	compare/models.py
	compare/models.pyc
	cooktax/settings.pyc
	db/source/ingestion.py
Merge branch 'master' of https://github.com/mattkiefer/cooktax