Refresh the formatting from the cli output
Fixed settings tags from ec2
fixed a few issues with ec2 and elb imports
Added support for subnet and security groups from AWS