added diginorm with error correction...doesnt work yet though :-/
Merge branch 'refactor' into bleeding-edge
Fix from QP to remove dependency upon the 'matplotlib' package.

Conflicts:
	tests/test_scripts.py
Fix return type scoping issue identified by more recent version of GCC.
half-arsed streaming error trimming
Integrate rewritten parser logic into counting hashes. (Still need to fix a possible bug, but code executes without crashing.)
Merge branch 'bleeding-edge' into mt-reader
Compile without internal tracer logic for a speedup, if desired.
Fix some linking problems in Python wrapper.
blargghh...
changed pdbg readme
added tag
wtf
this should be identical to the ged-lab/khmer master branch
Merge branch 'pdbg'
merged master with pdbg
Do not open or close trace files if 'WITH_INTERNAL_TRACING' is not defined.
Add macro for switching between original parser and new parser for testing purposes. (The hashtables produced by the original parser and single-threaded operation of the new parser are currently indentical, btw.)
Fix divide-by-zero crash from performing abundance filtering with an initial file which is empty.
Merge from 'ged-lab/master'.
Create tests for Jared's --paired patch. Minor tweaks to the same.