Updates to EC2 and SSH helpers

This is ready to be merged in.