merged in changes from bsd1: removed swat, no overlapping idmap ranges, homedir and shell templates + idmap [ug]id ranges added back in