Handle newlines in comments/string literals.

Print properly-formatted error messages including correct column number.
Merge branch 'scanner'

Conflicts:
	scanner/scanner.py