if we can't start remote appcontrollers in 60 seconds, retry
adding the retry in
not using iaas-tools to see our public/private ip, since we have it in @nodes
added in missing mock
Merge pull request #306 from shatterednirvana/nginx-test-fix

Nginx test fix
using node.public_ip instead of IP-translated version, so that external callers can resolve the uaserver public ip
fixed broken app manager test
added timeout when waiting for rabbitmq to start up
Merge branch 'appcontroller-not-using-iaas-tools' into timeout-on-rabbitmq-startup
reduced timeout on waiting for rabbitmq to start to match how long it takes before it fails in EC2
using IPs instead of DNS in /etc/hosts so that appscale-imageX can be ssh'ed into once more
Merge pull request #304 from shatterednirvana/retry-on-god-start

Retry when starting other AppControllers
Merge pull request #308 from shatterednirvana/timeout-on-rabbitmq-startup

Timeout on RabbitMQ startup
removed unit test that wasn't testing anything new
more logging on ip mapping
Merge pull request #309 from shatterednirvana/appcontroller-not-using-iaas-tools

more logging on ip mapping
Merge pull request #310 from shatterednirvana/fixed-appmanager-test

Removed unnecessary AppManager test