wow, so i had managed to goof up the original merge from master. recreating setup.py from an older copy and keeping the version and some other slight changes from upstream.
wow, so i had managed to goof up the original merge from master. recreating setup.py from an older copy and keeping the version and some other slight changes from upstream.

bcdev/jpy,bcdev/jpy,bcdev/jpy,bcdev/jpy,bcdev/jpy