Merge pull request #6 from mmun/loc-info

Add location info
Replace carriage returns with line feeds

See http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#preprocessing-the-input-stream