Adding changes to support files being put into cookbooks in their final ...

...named form.  This reduces logic at deploy time.