fix partially #1236 - hopefully the exclude pattern will be generic enough for future changes ;)
Merge branch 'jruby-1_7' of jruby.org:jruby into jruby-1_7
fix includes for rdoc and rake default gems - added json as default gem as well. fixes #1251