Fix pi root deployment scripts

bs=1M speeds up deployment by 4x.

Also, default to 971 and make modify_rootfs.sh more robust to changes in
the image to modify

Change-Id: I2e1656a03ad2ec1c23b6d4d86759dcf0167659f6
diff --git a/y2020/vision/rootfs/change_hostname.sh b/y2020/vision/rootfs/change_hostname.sh
index 712aba9..f36c439 100755
--- a/y2020/vision/rootfs/change_hostname.sh
+++ b/y2020/vision/rootfs/change_hostname.sh
@@ -38,3 +38,9 @@
   echo -e "${IP_BASE}.2\troborio" >> /etc/hosts
 fi
 
+if grep '^10\.[0-9]*\.[0-9]*\.13\s*laptop$' /etc/hosts >/dev/null;
+then
+  sed -i "s/^10\.[0-9]*\.[0-9]*\(\.13\s*laptop\)$/${IP_BASE}\1/" /etc/hosts
+else
+  echo -e "${IP_BASE}.13\tlaptop" >> /etc/hosts
+fi