Support for empty lines in multi-line strings and rendering multi-line scalars.
added line information to parser errors
Merge remote-tracking branch 'swdunlop/master'
Merge remote-tracking branch 'moraes/master'