updates to calc-median-distribution in sandbox/
Merge branch 'master' of github.com:ged-lab/khmer into calc-median-updates
Removed load-into-hashbits from sandbox & ChangeLog

update. It is superseded by load-graph in scripts.
Merge branch 'master' of github.com:ged-lab/khmer into fix/load-into-hashbits

Conflicts:
	ChangeLog
Merge pull request #480 from ged-lab/fix/load-into-hashbits

Removed load-into-hashbits from sandbox & ChangeLog
Merge branch 'master' of github.com:ged-lab/khmer into calc-median-updates
updated ChangeLog for changes to calc-median-distribution
Merge pull request #184 from ged-lab/calc-median-updates

updates to calc-median-distribution in sandbox/
Merge remote-tracking branch 'origin' into cleanup/filepy2

Conflicts:
	ChangeLog