Merged course and preference settings into settings

My first coursemology pull request!