Merging commits from MHS

...he directory the JS files will be served from so it can remove those from the src file paths.