Clean up some scattered whitespace and formatting problems.
Merge pull request #422 from AnalyticalGraphicsInc/whitespace_fixes

Clean up some scattered whitespace and formatting problems.