Token sorting

Added sorting of machine and container tokens in the machine view.
Yeah this looks good, see my comment in the machines column code for a way to simplify the sorting a bit.