Fix --associate-public-ip-address option for EC2 run-instances

If user specifies a --associate-public-ip-address option and provides a --subnet-id option, we have to move the subnet ID value into the NetworkInterfaces structure we have created or we get a client error from EC2.  Fixes #501.