Brown affiliations query and template changes.
Merge branch 'master' of github.com:Brown-University-Library/vivo