added subjects to search result display, and remove subject facet. fixes #589
merged changes from master ; fixed indentation in template
Merge pull request #592 from gwu-libraries/t589-subjects-in-search

T589 subjects in search