Merge pull request #185 from joshbeitler/master

Somehow we got behind?
Aligned variables
Updated version info in GRUB config
Merge pull request #186 from joshbeitler/develop

Develop