Answer all Koans and include last-minute tweaks.
Remove nutrition.xml.
cherry-picked out last minute fixes from master and resolved conflicts