Find and select the machine token on drop

* New method to find a machine or container token given the machine's name
* Update call sites to select the machine/container token on creation.
* Tests.
Well, you'll still have to do a check here, b/c there's two "select" methods--that's actually why I just had a var to pass in, to cut down on the number of times this check has to be done.