Merge branch 'master' of github.com:allentiak/scribe-java