kill old grains, add ec2 grain, use it
Merge branch 'vpn'