Merged course and preference settings into settings, renamed tutor summary to staff summary.

My first coursemology pull request!