Merge pull request #4 from alecthomas/master

Add -stdout flag and sort types to reduce diffs.