grunt changes to combine css and javascript