Merge github.com:ged-lab/khmer into bleeding-edge
Merge branch 'bleeding-edge' of github.com:ged-lab/khmer into bleeding-edge
added threading params to filter-abund.py
Merge branch 'graceful-fail2' into bleeding-edge

Pull request merged into ged-lab/bleeding-edge
Merge branch 'bleeding-edge' of github.com:ged-lab/khmer into bleeding-edge

Updates since graceful-fail2 pull
Merge pull request #1 from ged-lab/bleeding-edge

Bleeding edge
Merge branch 'bleeding-edge' of github.com:ged-lab/khmer into bleeding-edge
Merge branch 'bleeding-edge' of github.com:cswelcher/khmer into bleeding-edge
Added typedefs to hashtable.hh
Added function prototype for consume and tag with colors
added code to insert colors into colormap
added consume_fasta functions
merged in refactor from ged-lab/graph_partitioning_on_abundance
promoted new code to hashtable to be in line with refactor
added _cmap_contains back in after being nuked by merge
fixed for proper pointers/refs, added reverse color map
added sweep function, getters for colors and tags, started color reconciliation
color sweep added
added parse function to python glue
added a spin lock for tag_colors (not strictly necessary, but ctb likes explicit things i hear)