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

.