Upgrade to grunt 0.4, make build better