Lastest changes for 8.5 release
Fix for issue #160
Overhaul of the way line numbers are handled in errors, issue #137
Added the ability for errors to identify the sub-program they're found in, related to #137