closes #251. Changed the default EC2 image upload from s3 to ebs.
Merge branch 'master' of github.com:aeolusproject/imagefactory