test ec2
Merge pull request #18 from thomasalrin/master

test ec2
Merge remote-tracking branch 'origin/master'

Conflicts:
	iaas/ec2/iaas.go