Incorporated Keith's changes to the process for building machines on Amazon EC2.
Merge pull request #36 from pziegfeld/amazon_updates

Incorporated Keith's changes for building machines on Amazon EC2.