Calculated file names with paths in fileLocations
Merge branch 'master' into filepaths
shortened path names
Merge pull request #17 from TysonKerr/filepaths

Calculated file names with paths in fileLocations