Merge branch 'master' of github.com:google/enjarify

Change from binary to 16-ary tree

Merge pull request google#14 from reinerh/master

Use OrderedDict instead of sorting to keep reproducibility and preserve order