Avoid cyclic expression generation(ScoringClassMapBuilder,CaseInsensitiveClassMapBuilder)
Merge pull request #34 from elgriffin/master

Update to test case and variableref.java
Remove incorrect import