Merge pull request #16 from adlnet/master

Sync up!
Formatting changes to 4.11 and 4.12
Missed a comma
Merge pull request #307 from andyjohnson/master

Re-formatting 4.11 and 4.12