Fix warnings and checkstyle errors introduced post-Matt C's changes.
Merge pull request #168 from bkemper-pentaho/master

Fix warnings and checkstyle errors introduced post-Matt C's changes.