Reformatted
Slightly abstracted out xbean-finder (classpath scraping)
Merge remote-tracking branch 'origin/master'