Altered files so that grunt build succeeds. Made progress towards reformatting js.