changed ParseError to include Attribute
Merge remote-tracking branch 'origin/master' into parser
Ben's IMPORT EXTERN and DEF EXTERN
issue #24 solved, extern stuff included in combinator parser
Merge branch 'parser'