Updating Makefile to swap in prod URLs
Tidying up JS files