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

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Fixing up .gitignore