add -i option to script/disk and stop forcing usb to partition
just clean up the messy whitespace created by last commit to keep the noise down