Adding numpy count_nonzero & minor template fix

Have i missed something?
edit: see my other comment.