Added function to determine valid octaves for a midi note
Removed note name and octave from note tokens in favor of midi note numbers
Renamed things