Data criteria categories in consistent order

Changed the view to pass an array, and not an object to the handlebars
template, and updated the template. This results in consistent ordering
across measures (alphabetical)
Bugfix and refactor data criteria categories in consistent order
Merge pull request #391 from mwptrsn/clinical_categories_ordering