CLC-2017 Put college and major in tabular form
CLC-2017 Fix test
Merge remote-tracking branch 'ctweney/CLC-2017' into CLC-2017

* ctweney/CLC-2017:
  CLC-2017 Fix test
  CLC-2017 Put college and major in tabular form
CLC-2017 - Show double and triple majors in column format
https://jira.media.berkeley.edu/jira/browse/CLC-2017
Follow up from #1400
Merge pull request #1404 from christianv/CLC-2017

CLC-2017 - Show double and triple majors in column format