Just doing some local tidy up to allow a merge to happen
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/skylight.php
	theme-local/.DS_Store
Merge pull request #39 from seesmith/master

LIB001-55, LIB001-558, LIB001-547, LIB001-560
LIB001-454 Update the Exams theme to have the Google Analytics code
Merge pull request #40 from robintaylor/LIB001-454

LIB001-454 Update the Exams theme to have the Google Analytics code
LIB001-527: Adding new header and footer images and updating CSS
LIB001-538: Minor fixes to art CSS
Merge pull request #41 from ianthe/LIB001-527

LIB001-527: Adding new header and footer images and updating CSS
Merge pull request #42 from ianthe/master

LIB001-538: Minor fixes to art CSS
LIB001-546 Reorder mimed facets
Fix broken config that I accidentally committed.
Merge pull request #43 from robintaylor/master

Fix broken config that I accidentally committed.
Merge remote-tracking branch 'upstream/master'
LIB001-538: Uploading correct ArtLUCLogo
Merge pull request #44 from ianthe/master

LIB001-538: Uploading correct ArtLUCLogo
Merge remote-tracking branch 'upstream/master'
updated gitignore and removed DS_Store