Almost done with grub update
changed to not get merge conflicts
Still had merge conflicts. now fixed
Grub password functionality complete. Now need to write tests
grub spec passing
Updated template to update kernel version
Merge pull request #12 from isuftin/master

1.5.3 complete