Finish work on grunt dev and prod modes