Some more cleanups
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/audioformat.rb
	models/show.rb