add stuff to chili recipe
Merge remote-tracking branch 'origin/master'