Using relative symlinks, fixes issue #1953
Bring back no name and simplify var merging
Merge pull request #1959 from jni-/mix_rel_symlink

Using relative symlinks, fixes issue #1953
Require arguments to be expanded to simplify relative symlink logic