Formatting
Merge branch 'newmodules' into jeff-norman
merge