More checkstyle changes....
Merge pull request #16 from bkemper-pentaho/master

More checkstyle changes....