making a "develop" branch in order to keep "master" more stable
Merge branch 'nell' into develop
more deleting, re-add the k-best-output option