update citation, minor on pipeline
merge with titus verison
Merge branch 'master' of https://github.com/ged-lab/2013-khmer-counting