Making changes suggested by Kirill and James
Fixing some tests
Removing unused class from rbnf rule parser
Merging upstream changes