Merge branch 'master' of github.com:chmarr/artshow-jockey

Conflicts:
	artshow/default_settings.py