Fixes #314
Merge remote-tracking branch 'origin/NewCanonicalization_24July2014'
hanoi tests passing again
certainly should not be including the chiral tag itself in the comparison