Multiple term facets

Once `PR` #15 is accepted, I will merge master into here to more easily display these changes & not other outstanding `PR`s