refactor part 2/2
moving the availability_zone into the service's tag instead of its own service
Merge pull request #14 from jdoconnor/more-tests

refactor part 2/2