fixing build and bundle to use the vardir option
removing data symlinks before creating them
two more var to vardir conversions
Merge branch 'master' into develop