BZ #1148947: Make kickstart template consistent with disk layout

https://bugzilla.redhat.com/show_bug.cgi?id=1148947

The disk layout portions of the kickstart template were inconsistent,
causing errors on other distros (CentOS). This should fix that.
Merge pull request #124 from bcrochet/bz/1148947

BZ #1148947: Make kickstart template consistent with disk layout