Add contents_grains

Also rename contents_pillar_newline to contents_newline, and to work
with all contents directives.