Apply code formatting, start on some checkstyle
Merge pull request #970 from bkemper-pentaho/master

Apply code formatting, start on some checkstyle