proj: use clj 1.6.0, criterium; grun.sh tweak
nil grammar: put ws and comments rules in separate file