Whitespace and formatting cleanup

Since there are so many pieces brought in from other projects there were a lot of inconsistencies with whitespace and formatting. I guessed which files were actually written specifically for this project and tried to follow the conventions there. Let me know if you want this broken out into multiple commits or if there are different conventions you'd like me to follow for this.