Updates to properly resolve url versus local file path on *nix boxes
Merge branch 'develop' into peteFix