fixed some grunt settings for proper builds
merge stuff