Merge branch 'label_rootfs' into ebs
Remove ephemeral mounts

It's no longer as simple as determining the instance architecture.
Especially as this is the arch of the host instance rather than the guest.

Most AMIs handle this with an init process on boot that checks the meta-data
service for the instance's block mappings.
Add dual Grub menu entries for EBS and S3

Defaults to EBS. Falls back to S3. The only difference is the root
device - (hd0,0) for EBS and (hd0) for S3.

Reversed order of cfg and imgtemplate vars to match the real file.
Merge remote-tracking branch 'dcarley/ebs'

Conflicts:
	ami_creator/ami_creator.py
Use Grub's hiddenmenu option

No need/ability to see the "graphical" menu anywhere.
Attempt consistency in root filesystem label

There's something weird going on with the root filesystem label.
ExtDiskMount prefixes fslabel with "_".  It's not clear why, but in
trying to solve some problems booting the AMI built with this image I
was frustrated by the inconsistency and wanted to make it a little
more transparent (although I didn't make it any less dumb).
Updated CentOS 6 KS config to my liking

Took some queues from Bashton's AMIs.
capturing some docs and remaining steps