Merge pull request #209 from pcpiela/master

Complete work to move metric-picker in the cluster view, and fix a host display issue.
Add the ability for the user to supply a function for ordering metrics in a metric group.
Merge remote branch 'upstream/master'