Manually ran through grunt

portions ran through grunt but js stopped working for combined,js. Will
fix that file another day - therefore currently not in use.