changes to make it work with Ubuntu 12.04 (precise)

Also allow adding SSH keys at runtime