styling changes
merge

Merge branch 'bento' of https://github.com/ualbertalib/discovery into bento
Fix conflicts.
Fix conflicts.
Limit EDS bento pane to articles.
Minor refactor.