Fix up a lot of the error messages reported by error matching.
Merge pull request #23 from gk5885/line-number-bug

Fix up a lot of the error messages reported by error matching.