CLC-1353 Expose blog feed as API endpoint
https://jira.media.berkeley.edu/jira/browse/CLC-1353
Conflicts:

	app/assets/stylesheets/_splash.scss
CLC-1353 Restore extraction of single blog entry in back-end RSS parser
https://jira.media.berkeley.edu/jira/browse/CLC-1353
CLC-1353 Refactor blog feed parser to not use instance variable syntax
Merge pull request #721 from shacker/CLC-1353c

CLC-1353 Expose blog feed as API endpoint
CLC-1365 Centralize setting of race_condition_ttl and make it a bit longer
CLC-1365 Make proxies all have independently configurable cache expiration times
CLC-1365 Set expiration for BlogFeed
CLC-1386 Eli's UID is misconfigured for the Act As feature
https://jira.media.berkeley.edu/jira/browse/CLC-1386
Merge pull request #728 from shacker/CLC-1386

CLC-1386 Eli's UID is misconfigured for the Act As feature
CLC-1386 Master branch fix incorrect migration ID
Merge pull request #730 from ctweney/clc-1386-master

CLC-1386 Master branch fix incorrect migration ID
CLC-1386 Master branch addendum - allow Eli fix to run more than once without exploding
Merge pull request #732 from ctweney/clc-1386-master

CLC-1386 Master branch addendum
nojira: Document "Act As" in readme
Merge pull request #733 from shacker/nojira

nojira: Document "Act As" in readme
nojira: Add stop_act_as to readme
Merge pull request #734 from shacker/nojira2

nojira: Add stop_act_as to readme
CLC-1388 [Front-end] Implement "The Campus" designs
https://jira.media.berkeley.edu/jira/browse/CLC-1388
Merge pull request #735 from christianv/CLC-1388

CLC-1388 [Front-end] Implement "The Campus" designs
Merge pull request #727 from ctweney/clc-1365

CLC-1365 Independent cache expiration times for proxies