Added optional count field in convert_grammar_format.py
Merge branch 'master' of github.com:armatthews/timber