Token sorting

Added sorting of machine and container tokens in the machine view.
I just saw the case for 'name' above, which makes that observation moot.  Yes, I suppose we should remove this until we have support in core.