More checkstyle updates
Merge branch 'master' of github.com:jaytaph/switchbox into codestyle
more updates
Merge pull request #14 from jaytaph/codestyle2

Codestyle2