Merge pull request #88 from hailocab/ec2

EC2 additions and name corrections
Fix rebase error - add ownerId to Instances on DescribeInstances response