More sophistication and robustness for buildout and aws_up_and_running