Merge branch 'categories' of https://github.com/ging/vish into categories
Merge branch 'categories' of https://github.com/ging/vish into categories
Some categori order enhancements