Added ability to distinguish between EC2-VPC and EC2-Classic. Fixed capabilities for EIP.