Add AWS volume size and type, Fix DO SizeSlug issue

This contains merged branches and closes #339 #440 and #553 with resolved conflicts.



I'm confused why there is a "volume" and "block_device" section, seems there should only be one of these. I'd vote "block_volume" for clarity.