switched sysouts for log4j, removed sysouts in tests,
Merge remote-tracking branch 'origin/master' into log4j
Merge pull request #24 from headissue/log4j

Log4j