Merge branch 'gh-pages'
Adding clustering, categories for type of institution, and legend
Merge branch 'master' into gh-pages
Style changes