More checkstyle cleanups
Merge pull request #19 from bkemper-pentaho/master

More checkstyle cleanups