Remove redundant/unused EC2 code
Revised the "faulthandler not found" message

Signed-off-by: Steve Loranz <sloranz@redhat.com>
Merge branch 'master' of github.com:aeolusproject/imagefactory