Fix & improve grunt runs of nightwatch