Applied Pentaho code formatting rules && Fixed CheckStyle warnings as well.
Merge pull request #213 from rfellows/develop

Applied Pentaho code formatting rules && Fixed CheckStyle warnings as well