Merge pull request #185 from jazzdan/dev

Include line number with syntax errors
hogan.js style template inheritance