Additional bug fixes for Xen and EC2; move SSH authorized_keys persistence and ec2-metadata SSH key addition in to setup script (so it happens again on subsequent boots).