Fixed PowerMock conflicts with Log4j
Merge pull request #24 from punkhorn/master

Fixed PowerMock conflicts with Log4j