Formatting and checkstyle - pass1
Merge pull request #17 from bkemper-pentaho/master

Formatting and checkstyle - pass1