increment version
Merge pull request #2 from ged-lab/master

merge from master
Merge github.com:mr-c/khmer