Fix a couple bugs in conflicting method/macro detection.
Add dependency on jruby-complete.jar