Merge pull request #85 from mattconnolly/master

Fixes to Jruby, tests, etc
WIP on readme
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.