Merge pull request #998 from jeffreythomas/dev

core project formatting to conform to checkstyle.  Still need to do test...
core project formatting to conform to checkstyle in the tests src.