some alphabetizing
Merge pull request #576 from engstrom/master

Some Alphabetizing