Clean up some formatting and checkstyle problems
Merge pull request #65 from bkemper-pentaho/master

Clean up some formatting and checkstyle problems