Add saffron to recipe
Merge remote-tracking branch 'origin/master'