Modules version

merged latest develop, unittetst pass on laptop for envmodc and lmod.