Round of changes to eliminate several errors and get the parser closer to working
Merge branch 'master' of github.com:jcrawley/spitfire-maybe