fixing merge conflict in rakefile when pulling from dev
fixing merge conflict in rakefile when pulling from dev

ohboyohboyohboy/antlr3,ohboyohboyohboy/antlr3,ohboyohboyohboy/antlr3,ohboyohboyohboy/antlr3