Update from grunt-init-node and some fixes