Upgrade to Leiningen 2 / ANTLR 3.4