Fix vocal ranges

Fix vocal ranges in instruments.xml and some choral templates