Merge pull request #997 from jeffreythomas/dev

api project formatting to conform to checkstyle.
core project formatting to conform to checkstyle.  Still need to do tests.