fix issue #19 - fix how line positions/offsets are calculated

(cherry picked from commit 247f9f411b396732d1975e8f4822d9b6904a6551)

Conflicts:
	token/file.go
fix error introduced by commit 4356c475e8