Various style changes.
Merge branch 'develop' of https://github.com/zachwhelchel/churchof into develop