Also, I think this should just go into __init__.py for now. Longer term I've been thinking it might be good to move the AWS files into an aws directory to normalize the namespace (and more easily cover the case of openstack Heat getting incorporated).