final grunt and gulp changes