initial code for finding likely location of sequencing errors in shotgun data
initial calc-error-profile code working
fixed up error profile calculation
fixed failing test to ignore first k bases in read in error profile
comment update; change default C for calc-error-profile
Merge branch 'reservoir_sampling' into kmer_error_profile
Merge branch 'master' of github.com:ged-lab/khmer into kmer_error_profile
cleanup of calc-error-profile
Merge branch 'master' of github.com:ged-lab/khmer into kmer_error_profile

Conflicts:
	tests/test_counting_hash.py
fixed +x for calc_error_profile
script for collecting variant reads, using graphalign
Merge branch 'update/streaming' into feature/collect-variants
quick & dirty streaming error correction
correct-errors script cleanup
minor refactor of correct errors
Merge branch 'master' of github.com:ged-lab/khmer into feature/collect-variants
added additional output
Merge branch 'master' of github.com:ged-lab/khmer into merge

Conflicts:
	khmer/_khmermodule.cc
	lib/counting.cc
	lib/counting.hh
	lib/hashtable.hh
fix test str
Merge branch 'kmer_error_profile' into merge