[CLC-1882] Moving settings back into application.html.erb also needs to move the fn that sets the setings into applicationController

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1882