grunt build and serve:dist both now do the right thing