Tweaks to language parser.
Merge branch 'master' of github.com:/flackr/dungeon