Fixed more places where we need to look for en dash as well as -.

Closes #70.
'make quick' should make test suite too.
Added tests for issue #70.