Clean up spurious trailing whitespace, and extra/missing newlines at EOF.
Merge pull request #1202 from MrJoy/whitespace_cleanup

Clean up spurious trailing whitespace, and extra/missing newlines at EOF...