Hm, I know I thought this when I saw this PR but apparently didn't make it into a comment...

Is there a reason for both VHD and raw disk images? The only reason we produce both for rackspace is we didn't initially have a way to add VHD images (which they use internally) directly to their system.