Several updates to simplify grunt plugin