deleted some dead code, cleaned up a little
Merge branch 'master' of https://github.com/SL2Team/sl2
Fixed issue #30 in both parsers, added test