Update conf file to use custom numlines codec
Merge branch 'master' of git://github.com/cutoffthetop/thesis