Added category order support

Categories should sort on category, then name. That way if none of the categories are set, they'll still behave the same.