Include conf in classpath so that we read the logback.xml
Merge remote-tracking branch 'origin/master'