Fixed: order of dissonance annotations in dissonance score output

The rows of dissonance analysis now show up in the same order
as their placement in the score.
Fixed: identification of consonant fourths as consonant in dissonance.py

The new ConsMakerIndexer now correctly distinguishes between consonant and
dissonant perfect fourths in most standard cases.
New: A4s and d5s are labelled  consonant in some situations in dissonance.py

If a diminished fifth has a major sixth below its lower note or an augmented
fourth has a minor third below its lower note, those dissonant intervals
will be labelled as consonances.
New: labels that can be easily changed for A4s and d5s in dissonance.py

Now Aug4s and dim5s are labelled as CA4 and Cd5 respectively and the labels
can be changes at the top of the file.
Merge branch 'diss_sigs' of github.com:ELVIS-Project/vis into diss_sigs