API workflow ok, just need to fix ranking/scoring stuff now
Calorie-diff multiplier needed to be positive, not negative, duh
Merge branch 'master' of https://github.com/ptdavteam/MyNextFeed

Conflicts:
	recipe_api/api.py
Fixed a couple more things that I broke in the merge :-)