Change order of two mapgen parameters, add farms