Using short form of AtomExpression conversion
Adding Rice
Merge branch 'master' into cooking

Conflicts:
	src/main/scala/com/github/rcmurphy/dietmodel/Model.scala