Token sorting

Added sorting of machine and container tokens in the machine view.
I think this is potentially meaningless since mem and disk are in different units.  We should check with design to be sure, but one option for each would probably be best.