Add 'What belongs here?' section to README
Merge remote-tracking branch 'upstream/master'
closer matching of the java api