Apply formatting, start to fixup checkstyle warnings
Merge pull request #25 from bkemper-pentaho/master

Apply formatting, start to fixup checkstyle warnings