Moved path component of filename in to the 'dir' attribute where applicable.
Merge pull request #960 from aodn/gsp_includes_dir_file

Moved path component of filename in to the 'dir' attribute where applica...