ec2-build: attempt to fix KeyPair
ec2-build.sh: fixes based on a test