Jimmy/grml96 grub rewrite

Squashed the commits