update to jruby-1.7.18
Merge branch 'master' of https://github.com/jashkenas/ruby-processing

Conflicts:
	README.md