Fix #58; prevent errors on non-login shells

Also copies over name generator updates from kitchen-digitalocean.