remove naming cruft, clarify comment

Removed confusing leftover "use_machine_name" variable
Made comment about :container_name more clear
Merge pull request #225 from ccope/name-cleanup

remove naming cruft, clarify comment