Formatting

Prepping for release.

Will merge in some of the other pulls in a moment. :)