Merge pull request #46 from vmarmol/fix-names

Track a container's aliases too
Using the container's aliases in the UI.

Fixes #28.