with matt's changes.
Merge branch 'content' of https://github.com/w2ogroup/heroku-buildpack-java into content