--disk-limit now also sets map limit; limits now specified in MiB