Add rest of R10k environment and fix the modulepath order, to include the current module and the general env