Clean volumes.py
Fix merge issues
Merge branch 'master' of github.com:imduffy15/ec2stack