Ingredient name is now getting split from descriptors and prep terms
Merge branch 'master' of https://github.com/williamgross/337RecipeTransform

Conflicts:
	database.pyc