update makefile and notebook
Merge branch 'master' of https://github.com/ged-lab/2013-khmer-counting