make crowbar machines aliases also output node name

This is useful for seeing the mapping between node name and alias.
allow a node's alias to be unset
Merge pull request #1151 from aspiers/aliases

make crowbar machines aliases also output node name