rpearce: Populate storage hash when image_size is not nil
rpearce: Default storage size for / to 3G if image_size is not specified
rpearce: Image size should not be overwritten when printing the spec
rpearce: Adding new storage block to specs for all tests
Merge branch 'storage'

Conflicts:
	lib/stacks/machine_def.rb
	spec/ci_slave_spec.rb
	spec/deb_repo_mirror_spec.rb
	spec/deb_repo_spec.rb
	spec/dsl_spec.rb
	spec/fmanalytics_spec.rb
	spec/lb_spec.rb
	spec/logstash_spec.rb
	spec/mongodb_spec.rb
	spec/mysqldb_spec.rb
	spec/quant_spec.rb
	spec/selenium_spec.rb
	spec/standard_machine_spec.rb
	spec/storage_spec.rb
	spec/tim_spec.rb