CLC-2216 Translate colleges and majors into more friendly text

Squashed commit of the following:

commit 1aa1bc4c401c3cbca8b4657a12c251fdb106c50c
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Aug 5 11:01:08 2013 -0700

    CLC-2017 Translate majors, and tweak college translations

commit 5632a5d5c088d8998fb389219344b06cf21a9ae3
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Aug 1 09:26:28 2013 -0700

    CLC-2017 Lookup table for Colleges
Merge pull request #1369 from ctweney/clc-2226

CLC-2216 Translate colleges and majors into more friendly text