Update loci and locitest for match canonicalization.
Merge into master from pull request #25:
Update loci and locitest for match canonicalization. (https://github.com/floodlight/indigo/pull/25)