Port name generator changes back from DO driver
Fix #54; prevent errors on non-login shells
Merge pull request #58 from test-kitchen/roboticcheese/more-name-generator-changes

Fix #54; prevent errors on non-login shells