Merge remote-tracking branch 'upstream/master'
Add option for launch indexer directly from jar
Merge branch 'master' of https://github.com/solidm/twofishes