Added grunt server and new serve command