Update grunt build logic