Fixed bug in naming of glue grammars
Merge branch 'master' of github.com:armatthews/timber