Added concat_basedir to facter variables and fixed spec options