[CLC-1361] Stashing away email in Oauth2:app_data
CLC-1168 Show time as well as date on Canvas tasks
https://jira.media.berkeley.edu/jira/browse/CLC-1168
nojira: Streamline bucketizing of connected services in angular settings controller
Merge pull request #724 from shacker/nojira

nojira: Streamline bucketizing of connected services in angular settings...
Merge pull request #722 from shacker/CLC-1168

CLC-1168 Show time as well as date on Canvas tasks
[CLC-1361] Back out changes on .gitignore
Merge pull request #720 from ctweney/clc-1365

CLC-1365 Get more log info into cache log
NOJIRA - top align blog header with date
Merge pull request #723 from ctweney/clc-1380

CLC-1380 Add user's staff/faculty/student role to status feed
Merge pull request #725 from christianv/lineheightblog

NOJIRA - top align blog header with date
CLC-1355 - Light grey is darker than medium grey
https://jira.media.berkeley.edu/jira/browse/CLC-1355
Merge pull request #726 from christianv/CLC-1355

CLC-1355 - Light grey is darker than medium grey
Merge pull request #713 from yuhunglin/CLC-1361

[CLC-1361] Stashing away email in Oauth2:app_data
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