Finished checkstyle/formatting extensions.
Merge pull request #988 from jeffreythomas/dev

Finished checkstyle/formatting extensions.