Update with Gruntfile begin
Merge and added some stuff