Start of multistage sort.
Start working on merging.
Merge branch 'master' into multistage

Conflicts:
	encode.c
Actually do the merge.
Go back to larger sorting units (50MB).
Use POSIX sysconf() instead of getpagesize() for portability.
Merge branch 'master' of https://github.com/ericfischer/datamaps