Bring back grub update with fixes

This brings back the grub update, adding additional tests and making behavior more sane. If you find errors with your configuration, please report them so that we can create a better test suite to help reduce problems in the future.