Token sorting

Added sorting of machine and container tokens in the machine view.
Or at least I thought he had, doesn't seem to be working for me.