Simplify grammar mapping loading
Merge branch 'master' of github.com:Mause/tyrian