ec2 and ebs cleanup
Merge branch 'master' of github.com:grotiiy/muskat