add aliases
merge
add amazon ec2
merged