sort services and hosts
Merge branch 'master' of github.com:exoscale/riemann-grid