code cleanup
updated to clavin-nerd 1.0.1
major refactoring of disambiguation strategy; separates passes so we can reorder them (and tracks how often each is triggered)
more refactoring