Issue #254 - Alphabetize some imports, strip whitespace, and add file headers.