CLC-2974 Use JRuby 1.7.8
Merge pull request #1932 from ctweney/clc-2974

CLC-2974 Use JRuby 1.7.8
CLC-2986 - Dropdown on GPA calculator lost it's styling
https://jira.media.berkeley.edu/jira/browse/CLC-2986
CLC-2934 Remove unused cache settings
Merge pull request #1935 from ctweney/clc-2934

CLC-2934 Remove unused cache settings
CLC-2294 - Test out new sites owned by API from Research Hub
Merge pull request #1934 from christianv/CLC-2986

CLC-2986 - Dropdown on GPA calculator lost it's styling
Merge pull request #1908 from wonjunnn/CLC-2294

CLC-2294 - Test out new sites owned by API from Research Hub
CLC-2729 - Class Pages - show list of videos
https://jira.media.berkeley.edu/jira/browse/CLC-2729
CLC-2934 Expire Google mail and calendar at 4 mins instead of 2
Merge pull request #1937 from ctweney/clc-2934-expirationTweak

CLC-2934 Expire Google mail and calendar at 4 mins instead of 2
Merge pull request #1936 from christianv/CLC-2729

CLC-2729 - Class Pages - show list of videos
NOJIRA Update README with better JRUBY_OPTS advice
Merge pull request #1938 from ctweney/readmeTweak

NOJIRA Update README with better JRUBY_OPTS advice
NOJIRA Document our xvfb requirement
Merge pull request #1939 from ctweney/readmeTweak

NOJIRA Document our xvfb requirement
NOJIRA Add Mike to test data
Merge pull request #1940 from raydavis/raywip

NOJIRA Add Mike to test data