Java non-solution
Merge pull request #122 from beders/master

Java non-solution
Add a vim modeline to the readme
Fix links and line width in the readme