Merge branch 'testing' of github.com:AppScale/appscale-tools
Merge branch 'testing' of github.com:AppScale/appscale-tools
fixing the ec2 agent to allow the create-image ct test to work
these changes make the zone flag required only if a disk flag is also present
Removing zone from required arguments for run_instances
increasing logging in god, and sending it a nohup so that it monitors cpu/memory correctly
Merge pull request #294 from briandrawert/fix-zone-info-as-optional-param

Fix to make zone an optional parameter
Merge pull request #295 from shatterednirvana/monitor-cpu-memory-in-god

increasing logging in god, and sending it a nohup so that it monitors correctly
added mocks in for when we start god with nohup
Merge pull request #298 from shatterednirvana/fixed-broken-god-mocks

added mocks in for when we start god with nohup
Merge remote-tracking branch 'org/testing' into better-error-handling-on-cleanup